self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-09 08:45:55 +02:00
Code Issues Releases Activity
4,296 Commits 242 Branches 1,259 Tags 664 MiB
0ee370303c
Commit Graph

4296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Cozic
0ee370303c Update geolocalisation info on French translation 2020-06-03 16:54:56 +01:00
TheOnlyTrueJonathanHeard
cfe1911723
All: Resolves #173: Upload attachments > 4 MB when using OneDrive (#3195) 2020-06-03 14:29:47 +01:00
lscolombo
b2318b1f9f
Doc: Changed favicon.ico for latest Joplin logo (#3321) 
Co-authored-by: lscolombo <lucianasoclolombo@gmail.com>
 2020-06-03 14:25:00 +01:00
Laurent Cozic
0603f179cc Update translations 2020-06-02 19:40:28 +00:00
Laurent Cozic
21fcaf621d Tools: Improve how translations are built to make sure no translation is missed 2020-06-02 19:33:08 +00:00
Laurent Cozic
794c8dd051 Update translations 2020-06-02 18:36:22 +00:00
Laurent Cozic
f020b571da Update website 2020-06-03 11:41:02 +01:00
Laurent Cozic
071ea5854f
Desktop: Resolves #279: Add support for editable resources (#3305) 
* Add support for editable resources

* Fixed handling of resource paths

* Add delay before saving resource

* Delete temp files and stop watching when switching notes

* Handle sync when resource has been edited

* Handle resource conflicts

* Refactoring and handle conflicts from edit watcher

* Added test unit for conflict handling when deleting resource

* Trying to fix Travis-ci test units

* Fixed typo

* Update TinyMCE.tsx

* Update AsyncActionQueue.ts
 2020-06-02 22:43:06 +01:00
Laurent Cozic
bfec890632
Update AsyncActionQueue.ts 2020-06-02 22:35:41 +01:00
Laurent Cozic
3bb9d2efd6
Update TinyMCE.tsx 2020-06-02 22:35:05 +01:00
Laurent Cozic
dd557f66a5 Desktop: Create new notes with minimum set of properties to prevent a few minor bugs 2020-06-02 22:27:36 +01:00
Laurent Cozic
e117b6f732 Fixed typo 2020-06-02 17:50:43 +01:00
Laurent Cozic
710026c8ac Fixed typo 2020-06-02 17:50:24 +01:00
Laurent Cozic
79c45af0d5 Merge branch 'master' into editable_resources 2020-06-02 17:32:21 +01:00
Laurent Cozic
a75db94da5 Desktop: Fixes #3302: Prevent drag and dropping of text in editor as it can lead to data loss 2020-06-01 21:30:51 +00:00
Laurent Cozic
468261906a Desktop: Fixes #3298: Fixed shortcut to focus Note List when editor is in focus 2020-06-01 21:24:14 +00:00
Laurent Cozic
3f1c9c989b Desktop: Fixes #3286: Disable editor toolbar when editor is not in focus 2020-06-01 21:01:10 +00:00
叡山电车
3b40de1962
Desktop: Fixes #3171: Fixed issue with accentuated letters in GotoAnything (#3183) 
* fix #3171

* fix problem when searching with diacritics
 2020-06-02 16:57:24 +01:00
lscolombo
2dda1c82c5
All: Translation: Update es_ES.po (#3316) 
Added translations  and corrected others marked as 'Needs work'

Co-authored-by: lscolombo <lucianasoclolombo@gmail.com>
 2020-06-01 23:47:30 -04:00
dsp77
4bc4d41728
All: Translation: Update de_DE.po (#3315) 
* Added German translations

- Added missing translations
- Motified a few translations
- There is the question whether to translate the English "theme" to a
German word or keep its English version.

* Adjusted translation
 2020-06-01 23:45:46 -04:00
Gen Neko
c8c160d912
All: Translation: Update ja_JP.po (#3314) 
* All: Translation: Update ja_JP

* Translate new strings

* Explicitly specify an access key for menu items

* Fix an error in the previous commit
 2020-06-01 23:43:37 -04:00
Fathy AR
99354f7dbe
All: Translation: Update id_ID.po (#3309) 2020-06-01 23:43:02 -04:00
Laurent Cozic
279310f9a5
Tools: Fixed Linux build issue due to icon error (#3311) 2020-06-01 10:19:16 +01:00
Laurent Cozic
d0de79bffa Trying to fix Travis-ci test units 2020-05-31 21:07:24 +01:00
Laurent Cozic
fbd42726c0 Added test unit for conflict handling when deleting resource 2020-05-31 20:22:55 +01:00
Laurent Cozic
dfe02fbe96 macOS: Improved appearance of application icon 2020-05-31 17:50:41 +01:00
Laurent Cozic
a8cffb9ac8 Revert "macOS: Improved appearance of application icon" 
This reverts commit 334347abcf.
 2020-05-31 17:46:19 +01:00
Laurent Cozic
bdbf2fe583 Refactoring and handle conflicts from edit watcher 2020-05-31 17:43:51 +01:00
Laurent Cozic
36776cd615 Handle resource conflicts 2020-05-31 16:57:16 +01:00
Laurent Cozic
1852d9291d Handle sync when resource has been edited 2020-05-31 00:31:29 +01:00
Laurent Cozic
0e5a0fdbe5 Delete temp files and stop watching when switching notes 2020-05-30 17:49:29 +01:00
Laurent Cozic
7e59c40091 Add delay before saving resource 2020-05-30 17:10:25 +01:00
Laurent Cozic
53eba3f062 Fixed handling of resource paths 2020-05-30 15:28:42 +01:00
Laurent Cozic
334347abcf macOS: Improved appearance of application icon 2020-05-30 15:12:32 +01:00
Laurent Cozic
e43e3c198a Add support for editable resources 2020-05-30 13:25:05 +01:00
Ron Alleva
a8b8da4732
Doc: Update the faq for VSCode and Sublime (#3295) 
This updates the sublime text and VSCode commands to add options which
make them wait before closing. This is borrowed from how you set a
different editor for git commit messages, described by github here:
https://help.github.com/en/github/using-git/associating-text-editors-with-git

This should address #2425
 2020-05-29 10:04:44 +01:00
Helmut K. C. Tessarek
ea57f5655c
Update website 2020-05-28 22:31:55 -04:00
Helmut K. C. Tessarek
68496bd1a1
terminal.md: clarify install methods 2020-05-28 22:30:55 -04:00
Helmut K. C. Tessarek
097d4d5735
Update translations 2020-05-27 21:06:33 -04:00
Ivan Fadila Putra
89224c8f88
All: Translation : Add bahasa indonesia (id_ID.po) (#3246) 
* Translation : translate to bahasa indonesia

* fix(translation) : change to one letter

* fix(translation) : consistency N -> T

* rm(unused) : remove unused files
 2020-05-27 21:04:27 -04:00
yaozeye
22c0a219aa
All: Translation: Update zh_CN.po (#3288) 
Translation added, error fixed & expression improved.
 2020-05-27 21:00:09 -04:00
Helmut K. C. Tessarek
9eed42cea0
Update website 2020-05-27 20:46:53 -04:00
Helmut K. C. Tessarek
be24cbed2d
clarify, which install methods are supported/unsupported 2020-05-27 20:46:32 -04:00
Helmut K. C. Tessarek
aef3e0aead
Update website 2020-05-27 20:35:57 -04:00
Helmut K. C. Tessarek
7a06a41502
update section: install terminal application 2020-05-27 20:33:56 -04:00
Laurent Cozic
03948d185d Merge branch 'master' of github.com:laurent22/joplin 2020-05-27 17:22:13 +01:00
Laurent Cozic
40d39d6268
Desktop: Resolves #51: Add way to manually order notes by dragging them (#3235) 
* Allow custom sorting

* Implement UI

* Set order from message box

* Fixed mistake

* Update NoteListItem.tsx

* Desktop: Fixed date popup dialog overflow issue inside info dialog
 2020-05-27 17:21:46 +01:00
Anjula Karunarathne
66f1506429
Documentation: Fixed some typos in COTRIBUTING.md (#3277) 
Fixes some typos and a broken anchor link in `CONTRIBUTING.md` file
 2020-05-27 16:54:34 +01:00
Laurent Cozic
c97c337c79 Desktop: Fixed date popup dialog overflow issue inside info dialog 2020-05-25 17:37:37 +01:00
Laurent Cozic
0f7deeeac1 Desktp: Put back Edit in External Editor button 2020-05-25 11:37:45 +01:00