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

563 Commits (ca112ec5d384d249692b7720a23a4533033aaffe)

Author SHA1 Message Date
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
Laurent Cozic 2c608bca3c All: getting encryption service and UI to work 2017-12-14 19:39:13 +00:00
Laurent Cozic d9c1e30e9b Merge master into encryption branch 2017-12-15 07:31:57 +00:00
Laurent Cozic 5bc72e2b44 All: Decryption worker and handling of missing master key passwords 2017-12-14 18:53:08 +00:00
Laurent Cozic df05d04dad All: Made model naming more consistent 2017-12-14 18:12:14 +00:00
Laurent Cozic 888ac8f4c2 Electron: Started integrating encryption 2017-12-14 17:58:10 +00:00
Laurent Cozic 55266e5694 Fixed test units 2017-12-14 17:41:53 +00:00
Gabe Cohen 39c73e1649 Improve autocompletion 
1. Removed autocomplete menu because it lists the entire line, not just what is
being autocompleted.

2. Autocomplete positional args first unless cursor is at - then autocomplete
long options

3. Don't autocomplete an options that is already present.

4. Other fixes
 2017-12-14 07:53:49 -06:00
Gabe Cohen 3bf9d01f0a Remove unused code and retab 2017-12-14 07:01:00 -06:00
Gabe Cohen 89ef33f7ca convert spaces to tabs 2017-12-13 21:25:18 -06:00
Gabe Cohen f71fe9a1a6 Make autocomplete more intelligent 2017-12-13 21:13:43 -06:00
Laurent Cozic 1008b1835b All: Handle tag encryption and started CLI and Electron encryption front-end 2017-12-14 00:23:32 +00:00
Laurent Cozic bd20ecff78 All: Handle conflict for encrypted notes 2017-12-13 22:53:20 +00:00
Laurent Cozic ee02f8255e All: Encryption setup on apps 2017-12-13 19:01:04 +00:00
Laurent Cozic 5951ed3f55 All: Support encrypting notes and notebooks 2017-12-13 18:57:40 +00:00
Laurent Cozic f6fbf3ba0f All: Handle master key in backend 2017-12-12 21:58:57 +00:00
Laurent Cozic e44975622a CLI: Handling of password prompt 2017-12-12 18:17:30 +00:00
Gabe Cohen 671e538740 Contain autocomplete in StatusBarWidget.js 
StatusBarWidget.js now imports app itself and gets command names.
app-gui.js no longer sets the autocomplete of StatusBarWidget itself.
 2017-12-11 19:31:11 -06:00
Gabe Cohen cda623a95c Added command auto complete 
File based autocompletion is not yet implemented. This will require knowledge of
the command, and it's parameters. The autocomplete feture is pretty powerful
however, so this should not be very difficult to add.
 2017-12-09 23:08:28 -06:00
Laurent Cozic 238b5ab9b9 CLI: version bump to fix Homebrew formula 2017-12-08 21:41:41 +00:00
Laurent Cozic 027f96d100 Electron: Fixes #36: Set installation directory for Windows installer 2017-12-07 18:17:41 +00:00
Laurent Cozic ad6c347180 CLI: Fixed shell mode 2017-12-07 18:12:46 +00:00
Laurent Cozic ab8c66a361 Updated tools 2017-12-04 18:16:14 +00:00
Laurent Cozic 4b55fefcb1 Cleaned up build tools 2017-12-04 17:55:06 +00:00
Laurent Cozic 0eac8b25e1 Deleted uneeded file 2017-12-03 23:06:02 +00:00
Laurent Cozic 7851b6b429 Version update 2017-12-02 15:57:19 +00:00
Laurent Cozic 6c3918ebd2 All: Improved Evernote import for blockquotes and sup tags 2017-12-02 12:49:42 +00:00
Laurent Cozic ff502670bf Updated Readme, mentioned Homebrew 2017-12-01 20:06:20 +00:00
Laurent Cozic 58bc708014 Merge branch 'master' of github.com:laurent22/joplin 2017-12-01 18:56:43 +00:00
Laurent Cozic ede1ed8b22 macOS: Allow BACKSPACE instead of DELETE in CLI app 2017-12-01 18:56:35 +00:00
Laurent Cozic 9d984596cc CLI: fixed crash when inputting command without closed quote 2017-12-01 17:51:27 +00:00
Laurent Cozic 2ef2296566 Update website 2017-11-30 20:30:01 +00:00
Laurent Cozic 16bf0cf646 All: Added Spanish (Costa Rica) locale 2017-11-30 18:29:10 +00:00
Laurent Cozic 52f09d2638 Electron: Fixed import of certain images 2017-11-29 23:27:20 +00:00
Laurent Cozic a346116d5f Update website 2017-11-29 16:03:19 +00:00
Laurent Cozic 033d356b56 Removed dependency to marked and update locale 2017-11-28 18:07:49 +00:00
Laurent Cozic 9a40851c77 Electron, Mobile: Created alarm service and drivers 2017-11-27 22:50:46 +00:00
Laurent Cozic 914a2554ab All: Updated translations 2017-11-24 19:59:21 +00:00
Laurent Cozic 26bb7dc33b All: Added dev sync target and option to select it in mobile 2017-11-24 19:47:24 +00:00
Laurent Cozic a96b91cfef All: Removed sync target info out of setting class 2017-11-24 19:21:30 +00:00
Laurent Cozic 03251d4c40 All: renamed sync targets 2017-11-24 19:09:15 +00:00
Laurent Cozic 112609c5f1 All: Moving sync target logic to SyncTarget classes 2017-11-24 18:59:16 +00:00
Laurent Cozic cc7cbc2ecf All: Started moving sync target logic under SyncTarget classes 2017-11-24 18:37:40 +00:00
Laurent Cozic 946ad7c71a All: Started moving sync target logic under SyncTarget classes 2017-11-24 18:06:30 +00:00
Laurent Cozic d7f3cfd778 All: Started moving sync glue logic to SyncTarget classes 2017-11-23 23:10:55 +00:00
Laurent Cozic e4d48f43d6 Allow multiple selection 2017-11-22 18:35:31 +00:00
Laurent Cozic 27af0e69ef Electron release v0.10.23 2017-11-21 18:26:17 +00:00
Laurent Cozic f5feb595f6 Updated translation 2017-11-21 19:14:30 +00:00
Laurent Cozic 3722012da5 Added command to export debug information from mobile and CLI 2017-11-21 18:48:50 +00:00
Laurent Cozic c5214b6c44 Core: Fixed potential out-of-sync issue if user cancels while in the middle of delta step 2017-11-21 18:17:50 +00:00
Laurent Cozic 1c1228bb88 Electron release v0.10.22 2017-11-20 18:59:13 +00:00
Laurent Cozic 7d9eec262a Updated translation 2017-11-20 18:58:51 +00:00
Laurent Cozic 3d6fe4c2cd Android: Fixed image picker issues 2017-11-20 19:01:19 +00:00
Laurent Cozic f126e0a944 Update website 2017-11-18 17:35:49 +00:00
Laurent Cozic 9519bb1218 Update website 2017-11-18 16:13:27 +00:00
Laurent Cozic 716b1315a9 Electron release v0.10.21 2017-11-17 23:42:45 +00:00
Laurent Cozic 6f88c025f5 Update locale 2017-11-17 23:33:20 +00:00
Laurent Cozic 2f3458e207 Added share buttons 2017-11-17 23:17:16 +00:00
Laurent Cozic bd265e5a9d Added share buttons 2017-11-17 23:09:57 +00:00
Laurent Cozic 9d5d197747 Added share buttons 2017-11-17 23:07:04 +00:00
Laurent Cozic ba1a005fcd Updading website 2017-11-17 22:15:54 +00:00
Laurent Cozic f09cec794b Updading website 2017-11-17 22:12:30 +00:00
Laurent Cozic 240fbf1720 Trying to publish website from /docs 2017-11-17 21:34:04 +00:00
Laurent Cozic 504c3d4c0d Updating website 2017-11-17 19:07:32 +00:00
Laurent Cozic 409f2ca98d Electron: search 2017-11-17 18:57:27 +00:00
Laurent Cozic 94a800aa3c Electron release v0.10.18 2017-11-16 19:21:23 +00:00
Laurent Cozic 5098c03264 Allow setting extra flags and renaming folder 2017-11-16 18:51:11 +00:00
Laurent Cozic dbb5599b0f Save window state 2017-11-14 18:02:58 +00:00
Laurent Cozic 48061457ac Various tweaks to get prod version to work 2017-11-13 18:47:35 +00:00
Laurent Cozic be77f15ef7 Electron: Fixed issue with conflict folder and fixed sync tests 2017-11-12 18:57:59 +00:00
Laurent Cozic 6d2a5a7b32 Electron: When deleting tag that is currently selected, select a new tag or folder 2017-11-12 17:37:04 +00:00
Laurent Cozic 6e9e3fc9bd Added config screen 2017-11-12 00:44:26 +00:00
Laurent Cozic eda3be066d Electron app: handle tags 2017-11-11 23:13:14 +00:00
Laurent Cozic e649670bfe Added support for enex import 2017-11-11 17:36:47 +00:00
Laurent Cozic 49c11fb22e Allow attaching files in Electron ap 2017-11-10 22:18:00 +00:00
Laurent Cozic a2219bedd7 Merge branch 'master' into no-babel 2017-11-08 21:39:07 +00:00
Laurent Cozic e3554c7aec Delete folders and tags 2017-11-08 21:22:24 +00:00
Laurent Cozic dd4a640480 Version 2017-11-07 18:05:49 +00:00
Laurent Cozic 5024dcf668 Improving markdown renderer 2017-11-06 23:56:33 +00:00
Laurent Cozic dbf51382c8 Refactor to move state changes to browser process 2017-11-05 00:17:48 +00:00
Laurent Cozic 056c0dbab7 Various clean up and tweaks for Electron app 2017-11-04 13:23:15 +00:00
Laurent Cozic ddf9f442e5 Removed need for build dir for Electron app 2017-11-04 12:32:26 +00:00
Laurent Cozic 6e4effdecf Refactoring so that CLI app and Electron app share the same base application 2017-11-04 12:23:46 +00:00
Laurent Cozic f1e1db6744 Clean up 2017-11-04 11:50:58 +00:00
Laurent Cozic 4f831f91f9 Cleaned up Electron building step 2017-11-04 11:46:06 +00:00
Laurent Cozic a1cb172bc3 Removed babel 2017-11-03 18:39:08 +00:00
Laurent Cozic 8a78ee5df6 Changed export to module.exports 2017-11-03 00:13:17 +00:00
Laurent Cozic 7781fbad76 Changed import statements to require to reduce dependency to Babel 2017-11-03 00:09:34 +00:00
Laurent Cozic 742cff5598 Improve sync conflict handling when the changes between local and remote don't matter 2017-11-02 22:48:17 +00:00
Laurent Cozic 8b454e1e95 Fixing website 2017-11-01 17:39:56 +00:00
Laurent Cozic 61a74bc7e0 Fixing website 2017-10-31 00:02:34 +00:00
Laurent Cozic e39acc6b77 Fixing website 2017-10-30 23:56:56 +00:00
Laurent Cozic 76a3ae77a2 Fixing website 2017-10-30 23:19:49 +00:00
Laurent Cozic 5c6ca02f8e Fixing website 2017-10-30 23:16:45 +00:00
Laurent Cozic 6b5907c6d4 Fixing website 2017-10-30 23:13:55 +00:00
Laurent Cozic 3f8e3edce0 Fixing website 2017-10-30 23:08:20 +00:00
Laurent Cozic 456fdfaec6 Fixing website 2017-10-30 22:59:46 +00:00
Laurent Cozic 8ca372b37a Fixing website 2017-10-30 22:58:41 +00:00
Laurent Cozic 7b4d69933c Fixing website 2017-10-30 22:47:36 +00:00
Laurent Cozic 494b9b01c1 Translation and rebuilt website 2017-10-30 22:43:11 +00:00
Laurent Cozic 9c70e9b233 Updated translation 2017-10-30 22:29:17 +00:00
Laurent Cozic 12b6902a49 Fixed RN text field and gave different OneDrive token to demo 2017-10-30 21:29:36 +00:00
Laurent Cozic f1123c3483 Added search shortcut 2017-10-30 18:39:20 +00:00
Laurent Cozic 5492e715f8 Fixed React Native app to work with latest versions of packages and removed dependency to yarn 2017-10-30 18:17:01 +00:00
Laurent Cozic a43f5a1b53 todo => to-do 2017-10-30 00:37:34 +00:00
Laurent Cozic 5a7028bd11 Got Android version working again 2017-10-30 00:29:10 +00:00
Laurent Cozic 4ac86f52df Doc update and Android releas 2017-10-29 23:46:04 +00:00
Laurent Cozic f54cbd3e26 Updated doc and help 2017-10-29 20:40:53 +00:00
Laurent Cozic 57995b1818 Fixed folder selection and deletion issue 2017-10-29 16:22:53 +00:00
Laurent Cozic 8dd844d79e Minor changes and updated doc 2017-10-29 15:41:30 +00:00
Laurent Cozic ddbae876de Added readme 2017-10-29 00:31:51 +01:00
Laurent Cozic 9dd8268d44 Fixed prompt 2017-10-28 18:55:45 +01:00
Laurent Cozic add1cb33bf Fixed scrolling and note loading issue 2017-10-28 18:44:28 +01:00
Laurent Cozic 269a77e5f3 Improved loading of notes 2017-10-28 18:07:10 +01:00
Laurent Cozic aefeca66d5 Added demo and improved parsing of markdown URLs 2017-10-28 00:20:03 +01:00
Laurent Cozic e4435a4fb6 Added ren command 2017-10-26 23:22:36 +01:00
Laurent Cozic 9628d369a3 Upgraded tkwidgets 2017-10-26 23:10:24 +01:00
Laurent Cozic 5b140544e0 Merge branch 'master' of github.com:laurent22/joplin 2017-10-26 22:57:56 +01:00
Laurent Cozic 2900603a8a Handle strange OneDrive sync error 2017-10-26 22:57:49 +01:00
Laurent Cozic 0b80859055 Improved sync 2017-10-26 23:56:32 +02:00
Laurent Cozic bd8926958f Improved handling of external links and resources 2017-10-26 20:58:27 +01:00
Laurent Cozic 31bfa72bca More info in case of error 2017-10-25 21:23:48 +01:00
Laurent Cozic 52f25c26d2 Minor UI changes and reverter back to npm 2017-10-25 18:23:45 +01:00
Laurent Cozic 3532b7ae87 Fixed headless sync 2017-10-25 17:41:36 +00:00
Laurent Cozic 900aee82f0 Added more shortcuts and improved existing ones. Fixed bg color issue in status bar. 2017-10-24 22:52:13 +01:00
Laurent Cozic 372b70270d Cleaned up commands and enable only relevant ones in CLI mode 2017-10-24 22:37:36 +01:00
Laurent Cozic 89d85541ef Scroll to bottom of console after inputting command 2017-10-24 22:09:22 +01:00
Laurent Cozic 528f1b0430 Strip down metadata being displayed in UI 2017-10-24 21:35:02 +01:00
Laurent Cozic fed256753c Minor usability improvements 2017-10-24 21:22:57 +01:00
Laurent Cozic 47da5f24e9 Show overlay window while editing note 2017-10-24 20:52:26 +01:00
Laurent Cozic 13b4f3f4ea Display link to resources and display them via server. 2017-10-24 20:40:15 +01:00
Laurent Cozic 3cb52a4107 Fixed state handling issue when deleting note 2017-10-24 18:17:49 +00:00
Laurent Cozic 218405503d Fixed handling of current folder 2017-10-24 18:09:01 +00:00
Laurent Cozic 3f56404c25 Allow cancelling OAuth dance, and fixed status bar display issue 2017-10-24 18:03:12 +00:00
Laurent Cozic 3de107d937 Fixed tag selection and made entered commands more visible 2017-10-23 23:11:50 +01:00
Laurent Cozic b89746f6d3 Improved item list and implemented delete 2017-10-23 22:48:29 +01:00
Laurent Cozic 01d01b76cd Implemented search and fixed Redux update loop 2017-10-23 21:34:04 +01:00
Laurent Cozic 17b8df2abc Got tags working and fixed sync issue 2017-10-22 18:12:16 +01:00
Laurent Cozic 0ee82bd5ce Better handling of network errors and improved borders 2017-10-22 13:45:56 +01:00
Laurent Cozic 6e49aa45c0 Fixed synchronization issue 2017-10-21 19:07:56 +01:00
Laurent Cozic cc92c29913 Fixed state when switching folder 2017-10-21 18:01:02 +01:00
Laurent Cozic 2675a89dda Fixed note sorting 2017-10-21 17:53:43 +01:00
Laurent Cozic ad1c0f3958 Added command attach and support for non-gui mode 2017-10-19 23:02:13 +01:00
Laurent Cozic 1845a0105c Many improvements and bug fixes 2017-10-18 23:13:53 +01:00
Laurent Cozic 4db08d1a26 Minor fixes and improvements 2017-10-17 22:56:22 +01:00
Laurent Cozic d4af90832b Cleaned up command processing logic and fixed a few bugs 2017-10-17 18:18:31 +01:00
Laurent Cozic 7d45e1000d Fixed status bar 2017-10-15 18:20:54 +01:00
Laurent Cozic 7e2b4f7da5 Changed console to status bar 2017-10-15 17:57:09 +01:00
Laurent Cozic 03facc93f5 Fixed selection in note and folder list 2017-10-15 12:38:22 +01:00
Laurent Cozic 3d8327ae0b Improved network error handling 2017-10-15 12:13:09 +01:00
Laurent Cozic 65ab55c031 Various changes 2017-10-14 22:44:50 +01:00
Laurent Cozic dcacebf216 Fixed editing notes 2017-10-14 19:03:23 +01:00
Laurent Cozic 4f1133c59a Switched to chalk 2017-10-13 18:25:58 +01:00
Laurent Cozic d53b6e5a72 Wrapped up terminal class 2017-10-13 18:21:57 +00:00
Laurent Cozic 0fac2f4457 Remove note ID 2017-10-12 22:59:38 +01:00
Laurent Cozic 916d75fd21 Colored prompt 2017-10-09 21:45:20 +01:00
Laurent Cozic 4edef57764 Fixed setting initialisation issue 2017-10-09 21:29:49 +01:00
Laurent Cozic 8c7cd8de88 Fixed updating view when note is deleted 2017-10-09 20:57:00 +01:00
Laurent Cozic 30480a8029 Switched to using properties 2017-10-09 18:05:01 +00:00
Laurent Cozic 1abab26041 Improved UI usability 2017-10-08 23:34:01 +01:00
Laurent Cozic 3704f5be27 Various improvements 2017-10-08 18:50:43 +01:00
Laurent Cozic dc219141fa Moved more widgets to redux 2017-10-07 23:17:10 +01:00
Laurent Cozic 6f34d717f8 Switching state handling to Redux 2017-10-07 22:01:03 +01:00
Laurent Cozic 6a3eb65a66 Changed to use object properties 2017-10-07 21:04:53 +01:00