self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-18 09:35:20 +02:00
Code Issues Releases Activity
4,645 Commits 244 Branches 1,266 Tags 536 MiB
67d4123608
Commit Graph

427 Commits

Author SHA1 Message Date
Laurent Cozic
ac07bf784d Adding Dropbox sync to Electron app 2018-03-26 18:33:55 +01:00
Laurent Cozic
67608e29c8 Electron: Resolves #144, Resolves #311: Highlight search results and search in real time. Associated Ctrl+F with searching. 2018-03-19 23:04:48 +00:00
Laurent Cozic
aabb9be7de Mobile: Resolves #285: Create, edit and remove tags from notes 2018-03-16 20:17:52 +00:00
Laurent Cozic
544f93bf22 All: Handle deletion of resources that are not linked to any note 2018-03-16 17:39:44 +00:00
Laurent Cozic
c1bb51c12b All: Finished service to clean up resources 2018-03-15 18:08:46 +00:00
Laurent Cozic
945018b698 All: Allow deleting and syncing deleted resources 2018-03-15 17:46:54 +00:00
Laurent Cozic
df7b981e5e Merge branch 'master' into resource_cleanup 2018-03-15 18:19:06 +00:00
Laurent Cozic
9e0bf1acb2 Mobile: Fixes #299: App freezes when connecting to OneDrive login page while internet connection is down 2018-03-14 23:17:02 +00:00
Laurent Cozic
c9e130a771 Merge branch 'master' into resource_cleanup 2018-03-14 17:41:06 +00:00
Laurent Cozic
26331f61e1 Electron: Resolves #298: Removed extraneous first characters from auto-title 2018-03-14 17:37:47 +00:00
Laurent Cozic
f595be07d4 Adding service to keep track of note resources associations 2018-03-12 23:40:43 +00:00
Laurent Cozic
dcaaf50a5a All: Fixes #271: Sort by created time was not respected 2018-03-10 15:34:55 +00:00
Laurent Cozic
55c5ddedf4 Revert "Applied prettier to code base" 
This reverts commit c4f19465a6.
 2018-03-09 20:59:12 +00:00
Laurent Cozic
c4f19465a6 Applied prettier to code base 2018-03-09 17:49:35 +00:00
Laurent Cozic
e41ae1832d Minor tweaks 2018-03-02 18:24:02 +00:00
Laurent Cozic
89b50909ed Electron: Resolves #266: Allow setting text editor font family 2018-03-02 18:16:48 +00:00
Laurent Cozic
8f2e5faff3 Support importing JEX and raw data 2018-02-25 17:01:16 +00:00
Laurent Cozic
8a96cf3434 All: Allow sorting notes by various fields 2018-02-22 18:58:15 +00:00
Laurent Cozic
14a93a9f26 All: Fixed sync interval sorting order 2018-02-21 19:58:28 +00:00
Laurent Cozic
4966d74864 All: Fixes #240: Tags should be handled in a case-insensitive way 2018-02-19 18:38:27 +00:00
Fernando
b0736002be Fixed several Nextcloud typos 2018-02-17 01:09:00 +01:00
Laurent Cozic
3551c26e28 Fixed race condition when testing with memory driver and fixed encoding issue 2018-02-15 17:12:09 +00:00
Laurent Cozic
1871123066 All: Improved WebDAV driver compatibility with some services (eg. Seafile) 2018-02-14 19:08:07 +00:00
Laurent Cozic
69fd32e7c6 All: Use mutex when saving model to avoid race conditions when decrypting and syncing at the same time 2018-02-07 19:02:07 +00:00
Laurent Cozic
fa5f418c22 All: Added sync config check to config screens 2018-02-06 18:59:36 +00:00
Laurent Cozic
30ff81064f All: Made WebDAV driver more generic to support services other than Nextcloud and added WebDAV sync target 2018-02-01 23:40:05 +00:00
Laurent Cozic
cca43624e4 Electron: Added tray icon support 2018-01-31 20:10:32 +00:00
Laurent Cozic
9b8f520b9f Electron: Allow focusing either title or body when creating a new note or to-odo 2018-01-30 21:49:22 +00:00
Laurent Cozic
6789b98ead Return fileNotFound error when file cannot be opened so that it is skipped by synchroniser 2018-01-28 17:37:03 +00:00
Laurent Cozic
5a9e0bfc26 Handle password text input in mobile and desktop 2018-01-25 22:44:09 +00:00
Laurent Cozic
7ab135c099 Various tweaks to get Nextcloud working in mobile 2018-01-25 20:48:01 +00:00
Laurent Cozic
1cc27f2509 Got Nextcloud sync to work in Electron 2018-01-25 19:01:14 +00:00
Laurent Cozic
fd29f20b2e Electron: Fix checkbox issue in config screen 2018-01-23 18:31:49 +00:00
Alex Devero
f52c117b09 Add font size settings 2018-01-19 13:27:44 +01:00
Laurent Cozic
9746a3964b All: Removed certain log statements so that sensitive info doesn't end up in logs 2018-01-17 21:17:40 +00:00
Laurent Cozic
1a5c8d126d All: Refactored filesystem sync driver to support mobile 2018-01-17 18:51:15 +00:00
Laurent Cozic
b10999e83e All: Update French translation 2018-01-15 18:35:39 +00:00
Laurent Cozic
961b5bfd25 All: Fixes #85: Don't record deleted_items entries for folders deleted via sync 2018-01-15 18:10:14 +00:00
Laurent Cozic
1fd1a73fda Electron: Improved the way new note are created, and automatically add a title. Made saving and loading notes more reliable. 2018-01-12 19:58:01 +00:00
Laurent Cozic
e9268edeff All: Fixes #150: Extra comma causes crash 2018-01-09 19:45:08 +00:00
Laurent Cozic
7b9dc66121 All: Schedule sync after enabling or disabling encryption 2018-01-08 21:25:38 +01:00
Laurent Cozic
d136161650 Android v0.10.71 2018-01-07 19:29:57 +00:00
Laurent Cozic
adc5885980 All: Better handling of null values in settings 2018-01-07 19:20:10 +00:00
Laurent Cozic
685f541bb4 All: Fixed issue with local resource needlessly marked as encrypted 2017-12-04 19:15:14 +00:00
Laurent Cozic
71e877d369 All: Improved encryption and synchronisation 2018-01-02 20:17:14 +01:00
Laurent Cozic
d180e7b5e1 Mobile: Handle encrypted items on UI side 2017-12-28 19:57:21 +00:00
Laurent Cozic
d1abf4971d Electron: E2EE config 2017-12-24 09:36:31 +01: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
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
4c0b472f67 All: Testing and better handling of E2EE initialisation 2017-12-17 20:51:45 +01:00
Laurent Cozic
f5d26e0d81 All: Fixed filesystem driver bug when downloading resources. Added support for encrypting all items when encryption enabled. 2017-12-14 21:12:02 +00:00
Laurent Cozic
e9bb5bee9d All: Better handling of encrypted data on UI side and prevent modification of encrypted notes 2017-12-14 20:21:36 +00:00
Laurent Cozic
2c608bca3c All: getting encryption service and UI to work 2017-12-14 19:39:13 +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
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