Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,046 Commits
244 Branches
1,281 Tags
607 MiB
Commit Graph

426 Commits (eb500cdf9ea095d4c3f61f13b5ee0616a5436c0e)

Author SHA1 Message Date
Laurent Cozic 78ce10ddf0 All: Fixed race condition when a note is being uploaded while it's being modified in the text editor 2018-01-08 20:09:01 +01:00
Laurent Cozic 8de5b4219d All: Updated translations 2018-01-06 21:05:34 +01:00
rtmkrlv 3fa891e136
Merge branch 'master' into russian-locale 2018-01-06 14:54:46 +02:00
rtmkrlv 6f7a9f3295 Updated Russian translation 
Added translation of new strings and small corrections
 2018-01-06 14:45:30 +02:00
Laurent Cozic 77fec75f23 CLI v0.10.86 2018-01-05 21:02:23 +01:00
Laurent Cozic d659d975cd All: Documentation and minor tweaks for E2EE 2018-01-05 18:40:57 +01:00
rtmkrlv 6ac3b8a8f9
Add files via upload 
Russian localisation for Joplin. 100% done, but some corrections may be required.
 2017-12-16 20:41:04 +02:00
Laurent Cozic 5780951f7d Updated translations 2017-12-15 08:46:30 +00:00
Laurent Cozic 64031ac6cf
Merge pull request #40 from Cogitri/german-locale 
WIP: Add German (Germany) locale
 2017-12-11 20:43:07 +00:00
Laurent Cozic caae7f7cf8 CLI v0.10.83 2017-12-11 20:12:41 +00:00
Laurent Cozic 043be1916c CLI: Display welcome message the first time the app is run. 2017-12-10 15:56:12 +00:00
Laurent Cozic 42e34b5c3b All: Fixes #87: Show warningn when deleting notebook that contains notes. 2017-12-10 14:09:12 +00:00
Rasmus Thomsen 09b9df4228 German locale: adjust articulation 2017-12-07 16:02:18 +01:00
Laurent Cozic 37663bd110
Merge pull request #68 from dbinary/master 
adding translate spanish Latin America
 2017-12-06 23:59:22 +00:00
Laurent Cozic 8838017830 All: Updated translations 2017-12-06 23:55:22 +00:00
Laurent Cozic 507e7e6014 All: Improved ENEX import for web pages that have been saved as notes 2017-12-06 19:29:58 +00:00
Laurent Cozic 4abe5d07c4 All: Handling of impossible-to-sync items (such as when they are over the size limit of the cloud provider) 2017-12-04 23:38:09 +00:00
Luis Pérez 4314c392f6 adding translate spanish Latin America 2017-12-04 13:24:55 -06:00
Laurent Cozic 685f541bb4 All: Fixed issue with local resource needlessly marked as encrypted 2017-12-04 19:15:14 +00:00
Laurent Cozic f9634ea283 CLI: Added e2ee command to check encryption status of a sync target 2017-12-04 19:01:56 +00:00
Laurent Cozic 6252a4d8c8 Merge branch 'master' into encryption 2018-01-03 20:23:26 +01:00
Laurent Cozic d13d7bec45 Minor changes 2018-01-03 20:20:16 +01:00
Laurent Cozic 7b82dacbf2 Update website 2018-01-03 00:17:31 +01:00
Laurent Cozic b22211fada All: Updated translations. Added Japanese and Chinese. 2018-01-02 21:27:38 +01:00
Laurent Cozic 79efac2f71
Merge pull request #130 from SamuelBlickle/master 
Improved german translation
 2018-01-02 21:22:27 +01:00
Laurent Cozic 71e877d369 All: Improved encryption and synchronisation 2018-01-02 20:17:14 +01:00
TAKAHASHI Kyohei 7e086a7730
Japanese localization 2018-01-02 14:17:39 +09:00
SamuelBlickle 3f810c71b0
improved german translations 2018-01-01 13:41:02 +01:00
Laurent Cozic 500fbc5294 Merge branch 'master' into encryption 2017-12-31 15:26:16 +01:00
Laurent Cozic 70a33f8533 CLI 0.10.84 2017-12-29 11:17:07 +01:00
Laurent Cozic 23722719f0
Merge pull request #82 from gabcoh/autocomplete 
Added auto complete
 2017-12-29 10:54:38 +01:00
Laurent Cozic d499251206
Update app-gui.js 
Invalidate root after inputting command
 2017-12-29 10:39:50 +01:00
Laurent Cozic 9e869a5b1f CLI: Various UI improvements for E2EE 2017-12-28 19:51:24 +00:00
Laurent Cozic ab959623aa CLI: Fixes #117: 'edit' command raising error in shell mode 2017-12-28 19:14:03 +00:00
Laurent Cozic 08d2655f13 All: Various improvements to E2EE 2017-12-26 11:38:53 +01:00
Gabe Cohen 20632ae1c1 Correctly implement autocomplete menu with prefix 2017-12-24 12:27:25 -06:00
Laurent Cozic d1abf4971d Electron: E2EE config 2017-12-24 09:36:31 +01:00
Gabe Cohen 3146273409 Improve autocomplete 
All commands and sub commands should now autocomplete. Titles are now wrapped in spaces and quoted titles are now properly parsed.
 2017-12-22 19:48:56 -06:00
Laurent Cozic 1891eb4998 All: Upgraded to fs-extra 5.0 2017-12-22 18:58:09 +00:00
Laurent Cozic 6683da804b All: Fixed various issues regarding encryption and decryptino of resources, and started doing GUI for Electron app 2017-12-21 20:06:08 +01:00
Laurent Cozic 7750b954fc All: Make sure existing resources are encrypted once E2EE has been enabled 2017-12-20 19:43:43 +00:00
Laurent Cozic edbff5a26a All: Simplified encryption header 2017-12-20 19:14:27 +00:00
Laurent Cozic 18846c11ed All: Allow disabling encryption and added more test cases 2017-12-20 20:45:25 +01:00
Laurent Cozic cc02c1d585 All: Simplified synchronisation of resources to simplify encryption, and implemented resource encryption 2017-12-19 19:01:29 +00:00
Laurent Cozic 3f4f154949 All: Refactored encryption/decryption method to use same algorithm for both file and string encryption 2017-12-18 20:54:03 +01:00
Laurent Cozic 4c0b472f67 All: Testing and better handling of E2EE initialisation 2017-12-17 20:51:45 +01:00
Laurent Cozic 75f8234db5 All: Added Russian translation. Thanks @rtmkrlv 2017-12-17 12:34:56 +01:00
Laurent Cozic b8e85e1587
Merge pull request #106 from rtmkrlv/russian-locale 
Russian localisation
 2017-12-17 11:33:34 +00:00
Laurent Cozic 4e41731c08 All: Updated translations 2017-12-17 12:30:32 +01:00
Gabe Cohen 4756238821 Remove unused import 2017-12-15 06:39:50 -06:00