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

320 Commits (0b9e007b46a0270873390e1f11948001a2cb59dc)

Author SHA1 Message Date
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 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 9bce52a92a All: Utilities to create and encrypt master keys 2017-12-12 18:41:02 +00:00
Laurent Cozic 6f97747199 Electron: Add support for file system sync 2017-12-07 22:29:02 +00:00
Laurent Cozic 03ec406627 All: Filter to sync target and refactored so that same code can be used by all clients 2017-12-05 19:21:01 +00:00
Laurent Cozic c703521b6c All: Handling of unsyncable items 2017-12-05 18:56:39 +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
Laurent Cozic dbeff4fd7d All: Allow attaching files of unknown mime type 2017-12-01 23:15:49 +00:00
Laurent Cozic d1a83d065a Mobile: Added status info to view active alarms 2017-11-28 20:31:14 +00:00
Laurent Cozic 4df73cd82c iOS: Handle foreground notifications 2017-11-28 20:17:34 +00:00
Laurent Cozic f9f5974267 All: Added option to set date and time format 2017-11-28 18:02:54 +00:00
Laurent Cozic 6e23fead59 Electron: Getting notifications to work 2017-11-28 00:22:38 +00:00
Laurent Cozic 9a40851c77 Electron, Mobile: Created alarm service and drivers 2017-11-27 22:50:46 +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 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 fbf7b2cc43 Mobile: Hide irrelevant settings 2017-11-23 18:54:26 +00:00
Laurent Cozic 6283bf6190 Minor fixing on note rendering 2017-11-21 19:47:29 +00:00
Laurent Cozic 48b648e656 Electron: allow disabling auto-updates 2017-11-21 19:37:34 +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 37de5fd4b3 Mobile: Improved loading of images. Added privacy policy url. 2017-11-20 18:25:23 +00:00
Laurent Cozic e80dd59da2 iOS: Fixed attaching images 2017-11-19 22:08:58 +00:00
Laurent Cozic 43bc7b5619 Electron: Fixed vertical scrollbar, and added option to display dev tool in prod 2017-11-17 18:02:01 +00:00
Laurent Cozic dbb5599b0f Save window state 2017-11-14 18:02:58 +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 6e75c93f3c Electron: styling 2017-11-12 17:53:26 +00:00
Laurent Cozic f9a06bb5b9 Electron: Save state of editor/viewer toggle 2017-11-12 17:02:20 +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 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 9e3af21e66 Optimised markdown rendering for mobile and electron 2017-11-07 18:39:11 +00:00
Laurent Cozic d601ed737b Got db and logger to working on Electron app 2017-11-04 11:26:49 +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 12b6902a49 Fixed RN text field and gave different OneDrive token to demo 2017-10-30 21:29:36 +00:00
Laurent Cozic 5a7028bd11 Got Android version working again 2017-10-30 00:29:10 +00: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 13b4f3f4ea Display link to resources and display them via server. 2017-10-24 20:40:15 +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 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 8c7cd8de88 Fixed updating view when note is deleted 2017-10-09 20:57:00 +01:00
Laurent Cozic fb0e8f36d4 Handle advanced options 2017-09-24 15:48:23 +01:00
Laurent Cozic d9c85a7275 Various changes 2017-08-22 19:57:35 +02:00
Laurent Cozic 67b812cab0 Various improvements 2017-08-21 22:46:31 +02:00
Laurent Cozic 36743bb4d7 Handle user timestamp 2017-08-20 22:11:32 +02:00
Laurent Cozic 671e8a3fc8 Allow exporting notes and notebooks 2017-08-20 16:29:18 +02:00
Laurent Cozic 1213819467 Fixed limit issue 2017-08-20 10:16:31 +02:00
Laurent Cozic a5daccce09 Per-target sync context 2017-08-19 22:56:28 +02:00
Laurent Cozic 303af9004d Resize images 2017-08-02 17:47:25 +00:00
Laurent Cozic 19266206f4 Attach resource from mobile 2017-08-01 23:40:14 +02:00
Laurent Cozic 72c4ed8453 Fixed config page 2017-07-31 22:51:24 +02:00
Laurent Cozic 192dac0ca4 Disabled back button handling on note screen for now 2017-07-31 19:02:21 +00:00
Laurent Cozic 4a7e8cdbaa CLI: fixed todo toggle 2017-07-31 18:47:06 +00:00
Laurent Cozic e5d4c649ad Added save icon, fixed search ordering bug and fixed html rendering bug 2017-07-31 18:19:58 +00:00
Laurent Cozic ad1fbba78d Various fixes 2017-07-30 21:51:18 +02:00
Laurent Cozic f228b48365 Various tweaks 2017-07-28 17:57:01 +00:00
Laurent Cozic bd06fa781e Fixed note sorting and changed colour of header 2017-07-27 18:25:42 +01:00
Laurent Cozic 89f1d5e6e7 Minor CLI bug fixes and improvements 2017-07-26 22:07:27 +01:00
Laurent Cozic f80263ab71 Load resources in WebView and put todos on top 2017-07-26 19:36:16 +01:00
Laurent Cozic 76914d6c28 Various bug fixes, optimisations and improvements 2017-07-26 17:49:01 +00:00
Laurent Cozic 81d4810018 Better handling of settings 2017-07-25 22:55:26 +01:00
Laurent Cozic d5e39d153f Support for tags 2017-07-25 19:36:52 +01:00
Laurent Cozic e128077326 Detect locale 2017-07-25 18:57:06 +00:00
Laurent Cozic 4464fb0f90 Set locale of RN app 2017-07-24 22:29:40 +01:00
Laurent Cozic fc7163b324 Sync when changing note or folder 2017-07-24 21:36:49 +01:00
Laurent Cozic a983a9f108 Tidy settings and sync creation 2017-07-24 18:58:11 +00:00
Laurent Cozic 0f95e97d19 Refactored handling of multiple sync targets 2017-07-24 18:01:40 +00:00
Laurent Cozic 04cd9a1e7b Started config screen 2017-07-23 19:26:50 +01:00
Laurent Cozic d05c62f69f Fixed note edition 2017-07-23 15:11:44 +01:00
Laurent Cozic 729b8f7c79 Handle case when note is deleted while being edited. Show note on map. 2017-07-22 19:16:16 +01:00
Laurent Cozic 5ca8647d35 Sync fixes 2017-07-19 20:15:55 +01:00
Laurent Cozic 7aa21174f6 Handle delta api for filesystem 2017-07-18 23:14:20 +01:00
Laurent Cozic 0c30c1b70b Fixed delta API for sync 2017-07-18 21:03:07 +01:00
Laurent Cozic 927894e940 OneDrive delta api 2017-07-18 19:57:49 +00:00
Laurent Cozic 980e4bded1 Various changes 2017-07-18 19:27:10 +00:00
Laurent Cozic f835ea74a4 Locale support 2017-07-18 18:04:47 +00:00
Laurent Cozic 268dfec554 Fixed sync issue with conflicted notes 2017-07-17 23:22:22 +01:00
Laurent Cozic ca68b85837 Fixed various issue in RN app 2017-07-17 21:22:05 +01:00
Laurent Cozic 70415332d0 Search function for CLI 2017-07-17 19:56:14 +00:00
Laurent Cozic 63772629cf mv folder in cli 2017-07-17 19:19:01 +00:00
Laurent Cozic c2ba2105ff Change folder from RN 2017-07-16 17:06:05 +01:00
Laurent Cozic 24f61177d1 Improved handling of multiple sync targets 2017-07-16 13:53:59 +01:00
Laurent Cozic 12c163ef73 Optimised saving notes 2017-07-16 00:09:04 +01:00
Laurent Cozic 4152fcec5e Fixed display issue when updating folder 2017-07-15 23:56:56 +01:00
Laurent Cozic 22cb2fdfbe Various improvements 2017-07-15 23:47:11 +01:00
Laurent Cozic 93791f1e46 Fixed note order in RN 2017-07-15 19:13:31 +01:00
Laurent Cozic e3db1e028a Handle reserved names in RN 2017-07-15 17:25:33 +01:00
Laurent Cozic dde0da571e Better UI to handle conflicts 2017-07-15 16:35:40 +01:00
Laurent Cozic 1c16e493f6 Many small changes 2017-07-15 00:12:32 +01:00
Laurent Cozic 4dc540e589 Minor changes 2017-07-14 18:02:45 +00:00
Laurent Cozic 4b07092a75 Fixed note serialization and edition 2017-07-13 22:26:45 +01:00
Laurent Cozic 7859a1b990 Fixed synchronizer conflict handling when deleting folders 2017-07-13 18:47:31 +00:00
Laurent Cozic 74e112fef9 Long list format 2017-07-12 21:39:47 +01:00
Laurent Cozic d1fecfde57 Bug fixes and integration tests for cli 2017-07-11 18:41:18 +00:00
Laurent Cozic 8c5f0622a2 Added cp command 2017-07-11 18:17:23 +00:00
Laurent Cozic e882c7b339 Status screen 2017-07-10 20:16:59 +01:00
Laurent Cozic 3f50e419da Fixed various bugs 2017-07-10 20:59:58 +00:00
Laurent Cozic cb30035060 Moved commands to separate files 2017-07-10 20:03:46 +00:00
Laurent Cozic f3d8c34499 Clean up 2017-07-10 18:09:58 +00:00
Laurent Cozic 38c9d49cdb Various changes 2017-07-07 23:25:03 +01:00
Laurent Cozic 216a6780cb Fixes for release apk 2017-07-07 18:49:07 +00:00
Laurent Cozic 8751aa1a34 Better error handling during sync setup 2017-07-06 23:15:31 +01:00
Laurent Cozic 8ee0c38f86 fetchblob 2017-07-06 22:30:45 +01:00
Laurent Cozic 40ed3216a3 Fixed RN sync issue 2017-07-06 20:01:12 +00:00
Laurent Cozic 23818cb428 Fixed import 2017-07-05 23:09:47 +01:00
Laurent Cozic a81fe24368 Made fs functions work again in cli 2017-07-05 22:52:31 +01:00
Laurent Cozic 8adb5a71c5 Got RN working again 2017-07-05 22:29:00 +01:00
Laurent Cozic f0a8cbe95d Started fixing ReactNative app 2017-07-05 21:34:25 +01:00