self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-27 10:32:58 +02:00
Code Issues Releases Activity
4,636 Commits 244 Branches 1,267 Tags 543 MiB
b24d060281
Commit Graph

1497 Commits

Author SHA1 Message Date
Laurent Cozic
1a1e264fa4 All: Refactored so that memory and file sync target use same delta logic 2018-01-21 19:45:32 +00:00
Laurent Cozic
5b99ecefca Merge branch 'master' into webdav 2018-01-21 19:10:39 +00:00
Laurent Cozic
1bfeed377a All: Optimised file sync logic so that it doesn't fetch the content of 
all the items on each sync. Also limit the number of items in a batch
to 1000
 2018-01-21 18:54:47 +00:00
Laurent Cozic
86eee376bb All: Handle case where resource blob is missing during sync 2018-01-21 17:48:50 +00:00
Laurent Cozic
6a7d368184 All: Started Nextcloud support 2018-01-21 17:01:37 +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
9efbf74b6f All: Various changes to get filesystem target to work on mobile 2018-01-17 21:01:41 +00:00
Laurent Cozic
6ff67e0995 Automate building and deploying Android app 2018-01-17 20:16:13 +00:00
Laurent Cozic
1a5c8d126d All: Refactored filesystem sync driver to support mobile 2018-01-17 18:51:15 +00:00
Laurent Cozic
1d73f0cdee Simplified and fixed caching issue 2018-01-17 17:59:33 +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
faade0afe2 All: Fixed model ID issue 2018-01-14 17:11:44 +00:00
Laurent Cozic
4d1dd17fa2 All: Fixed issue with timestamp when saving notes 2018-01-14 17:01:22 +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
feeb498a79 All: Fixed OneDrive sync when resync is requested 2018-01-12 19:01:34 +00:00
Laurent Cozic
1d7f30d441 Electron: Fixed logic to save, and make sure scheduled save always happen even when changing note 2018-01-11 21:05:34 +01:00
Laurent Cozic
53da63e371 Trying to add math support 2018-01-11 19:51:01 +00:00
Laurent Cozic
08b58f0e4c All: Fixed table font size and family 2018-01-09 21:09:49 +01:00
Laurent Cozic
0b93515711 Electron: Display URL for links 2018-01-09 19:26:46 +01:00
Laurent Cozic
e9268edeff All: Fixes #150: Extra comma causes crash 2018-01-09 19:45:08 +00:00
Laurent Cozic
eb500cdf9e All: Display sync items being fetched 2018-01-08 21:36:00 +01:00
Laurent Cozic
7b9dc66121 All: Schedule sync after enabling or disabling encryption 2018-01-08 21:25:38 +01:00
Laurent Cozic
bba2c68c6f All: Schedule sync only after 30 seconds 2018-01-08 21:05:08 +01:00
Laurent Cozic
c70d8bea78 All: Fixes #129: Tags are case insensitive 2018-01-08 21:04:44 +01:00
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
29f14681a8 Mobile: Fixed mix of tabs and spaces 2018-01-08 19:31:04 +00:00
Laurent Cozic
b99146ed7f
Merge pull request #111 from marcosvega91/fix_scroll_note_keyboard 
Fix scroll note keyboard on IOS
 2018-01-08 16:45:58 +00: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
83398dd0bc Mobile: Fixes #139: Crash when creating new notebook 2018-01-06 20:37:42 +01:00
Laurent Cozic
f45a4fff8b Mobile: Fixes #136, fixes #137: styling issues on E2EE 2018-01-06 10:06:41 +01:00
Laurent Cozic
d659d975cd All: Documentation and minor tweaks for E2EE 2018-01-05 18:40:57 +01:00
marcosvega91
277ad90f72 Indent with tab 2017-12-19 21:14:40 +01:00
marcosvega91
f2e3bedde6 Fix scroll 
After fixing the issue on ios, it caused an issue on android that I solved with this commit
 2017-12-19 10:28:52 +01:00
marcosvega91
98c0f2315a Fix scroll 
Fixed the issue that not permit to view edited text when the keyboard is shown.
 2017-12-19 10:08:22 +01:00
Laurent Cozic
4e41731c08 All: Updated translations 2017-12-17 12:30:32 +01:00
Laurent Cozic
42e34b5c3b All: Fixes #87: Show warningn when deleting notebook that contains notes. 2017-12-10 14:09:12 +00:00
Laurent Cozic
0115e74163 All: Minor tweaks regarding encryption 2017-12-04 19:29:34 +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
7efeaa3a22 All: Fixed minor issue when logger not defined 2018-01-02 21:23:35 +01:00
Laurent Cozic
71e877d369 All: Improved encryption and synchronisation 2018-01-02 20:17:14 +01:00
Laurent Cozic
500fbc5294 Merge branch 'master' into encryption 2017-12-31 15:26:16 +01:00
Laurent Cozic
6d0f60d9a1 All: Fixed tests and minor fixes 2017-12-31 15:23:05 +01:00
Laurent Cozic
e19c26fdd1 Mobile: Done UI for E2EE 2017-12-31 14:58:50 +01:00
Laurent Cozic
6ff19063ef All: Got E2EE working in mobile app 2017-12-30 20:57:34 +01:00
Laurent Cozic
d180e7b5e1 Mobile: Handle encrypted items on UI side 2017-12-28 19:57:21 +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
Laurent Cozic
bef7c38724 Electron: Improved enabling/disabling E2EE 2017-12-24 11:23:51 +01:00
Laurent Cozic
d1abf4971d Electron: E2EE config 2017-12-24 09:36:31 +01:00
Laurent Cozic
d13c2cf8d7 All: Fixed reading file by chuncks 2017-12-23 21:21:11 +01:00
Laurent Cozic
70b03971f6 All: Fixed handling of unloaded master key 2017-12-22 18:50:27 +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
26bf7c4d46 All: Improved file and memory drivers to make it easier to use same sync method for all the drivers 2017-12-18 21:47:25 +01:00
Laurent Cozic
2959fa1080 All: Added uploadBlob method to Node apps 2017-12-18 21:46:22 +01: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
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
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
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
92b857d83b All: Added methods to get secure random bytes 2017-12-12 17:51:07 +00:00
Laurent Cozic
8a282fd2e1 All: Added fs drivers and encryption service 2017-12-11 23:52:42 +00:00
Laurent Cozic
0f343bccda Electron: resolve #7: Show storage location in Options screen 2017-12-08 21:51:59 +00:00
Laurent Cozic
08d9e9b6aa All: Added support for HTML tags found in ENEX files: colgroup, col, ins, kbd, address, caption, var, area, map 2017-12-08 17:41:32 +00:00
Laurent Cozic
b929b46281 Mobile: Fixed dropdown positioning 2017-12-07 23:24:14 +00:00
Laurent Cozic
6f97747199 Electron: Add support for file system sync 2017-12-07 22:29:02 +00:00
Laurent Cozic
f3751e4ba6 Mobile: Fixed auto-assignment of title for new notes 2017-12-07 21:32:22 +00:00
Laurent Cozic
5cd55cada6 Mobile: Made context menu scrollable 2017-12-07 21:23:41 +00:00
Laurent Cozic
bad4b2ecb8 Electron: Added dialog to export sync status 2017-12-07 21:18:18 +00:00
Laurent Cozic
f242a3c215 Merge branch 'fix-cli' 2017-12-07 17:43:44 +00:00
Laurent Cozic
ad6c347180 CLI: Fixed shell mode 2017-12-07 18:12:46 +00:00
Laurent Cozic
7008daf92a All: Improved handling of empty links when importing ENEX files. Fixed minor layout issues in Electron app 2017-12-07 00:57:36 +00:00
Laurent Cozic
ed914c6907 All: Improved rendering of imported ENEX tables 2017-12-07 00:35:15 +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
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
f6633e23f5 Minor tweaks 2017-12-04 23:01:22 +00:00
Laurent Cozic
a6d6201ecb All: Improved synchronisation process and saving of models so that reducer can deal with full objects 2017-12-04 22:58:42 +00:00
Laurent Cozic
73e81a54b4 All: Fixed sync issue when target does not have reliable timestamps 2017-12-04 18:39:40 +00:00
Laurent Cozic
0eac8b25e1 Deleted uneeded file 2017-12-03 23:06:02 +00:00
Laurent Cozic
1830ee9fd2 All: Fixed sync issue and database migration issue 2017-12-02 15:18:15 +00:00
Laurent Cozic
fe2c1c197e All: fixed database creation error 2017-12-02 14:26:49 +00:00
Laurent Cozic
6c3918ebd2 All: Improved Evernote import for blockquotes and sup tags 2017-12-02 12:49:42 +00:00
Laurent Cozic
4dce9e9e47 Electron: Allow attaching multiple files 2017-12-01 23:26:08 +00:00
Laurent Cozic
dbeff4fd7d All: Allow attaching files of unknown mime type 2017-12-01 23:15:49 +00:00
Laurent Cozic
c72e0a14c0 Electron, Mobile: Fixed header sizes 2017-12-01 19:04:14 +00:00
Laurent Cozic
fe909f659d All: Added error message for OneDrive for Business 2017-12-01 17:47:18 +00:00
Laurent Cozic
e1b1f31cf1 Electron: #22 Fixes keyboard cursor jumps while typing. 2017-12-01 00:00:18 +00:00
Laurent Cozic
16bf0cf646 All: Added Spanish (Costa Rica) locale 2017-11-30 18:29:10 +00:00
Laurent Cozic
7f1a14fa22 All: Fixed note update issue 2017-11-30 00:25:52 +00:00
Laurent Cozic
52f09d2638 Electron: Fixed import of certain images 2017-11-29 23:27:20 +00:00
Laurent Cozic
565c17df37 Mobile: Improved OneDrive login 2017-11-28 21:49:58 +00:00
Laurent Cozic
2e8fe88f53 Don't needlessly reload resources 2017-11-28 21:15:22 +00:00
Laurent Cozic
d1a83d065a Mobile: Added status info to view active alarms 2017-11-28 20:31:14 +00:00
Laurent Cozic
ddb73c8642 iOS: Fixed notification event 2017-11-28 20:23:22 +00:00
Laurent Cozic
4df73cd82c iOS: Handle foreground notifications 2017-11-28 20:17:34 +00:00
Laurent Cozic
c446e4471d Merge branch 'alarm-support' of github.com:laurent22/joplin into alarm-support 2017-11-28 17:29:31 +00:00
Laurent Cozic
1a610054d3 Android: Fixed cancelling of notification 2017-11-28 19:49:03 +00:00
Laurent Cozic
11517fa037 iOS: Get notifications to work 2017-11-28 19:36:47 +00:00
Laurent Cozic
67a457b9c5 Android: Got notifications to work 2017-11-28 18:58:04 +00:00
Laurent Cozic
18dc6c826a Electron: Trigger notifications using node-notifier 2017-11-28 18:47:41 +00:00
Laurent Cozic
033d356b56 Removed dependency to marked and update locale 2017-11-28 18:07:49 +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
60d2b0c763 Merge branch 'master' into alarm-support 2017-11-24 17:09:24 +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
8e5b0eadd9 All: Clean up 2017-11-24 19:26:49 +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
fbf7b2cc43 Mobile: Hide irrelevant settings 2017-11-23 18:54:26 +00:00
Laurent Cozic
d8b19f7d08 Mobile: Also do multi-selection from search page 2017-11-23 18:41:35 +00:00
Laurent Cozic
acc4eb5d28 Mobile: Allow selecting, deleting and moving multiple notes 2017-11-23 18:47:51 +00:00
Laurent Cozic
e4d48f43d6 Allow multiple selection 2017-11-22 18:35:31 +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
367a18db93 Electron: fixed loading of resources, and disable drag and dropping of links in app 2017-11-21 19:31:21 +00:00
Laurent Cozic
c6ec0279fc Mobile: Made checkboxes smaller 2017-11-21 19:05:59 +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
518feadc3e All: Better checkbox alignment and added padding on notebook title 2017-11-20 18:40:36 +00:00
Laurent Cozic
b1e351ce77 Merge branch 'master' of github.com:laurent22/joplin 2017-11-20 18:31:10 +00:00
Laurent Cozic
c6cb2800d7 Android: improved image type detection 2017-11-20 19:18:49 +00:00
Laurent Cozic
3d6fe4c2cd Android: Fixed image picker issues 2017-11-20 19:01:19 +00:00
Laurent Cozic
da7034ae08 iOS: Improved icon and fixed file attachement issue 2017-11-20 18:29:39 +00:00
Laurent Cozic
37de5fd4b3 Mobile: Improved loading of images. Added privacy policy url. 2017-11-20 18:25:23 +00:00
Laurent Cozic
4de044dc90 Fix Android/iOS inconsitency with webview page scaling 2017-11-20 00:21:40 +00:00
Laurent Cozic
d5dc27d788 Use SVG icons for checkboxes 2017-11-19 23:34:41 +00:00
Laurent Cozic
e80dd59da2 iOS: Fixed attaching images 2017-11-19 22:08:58 +00:00
Laurent Cozic
cbd2075156 Merge branch 'ios-fixes-2' of github.com:laurent22/joplin into ios-fixes-2 2017-11-19 15:21:41 +00:00
Laurent Cozic
4b5c1491d0 iOS: various fixes 2017-11-19 15:19:36 +00:00
Laurent Cozic
ea077852a1 Mobile: allow attaching image or any other file 2017-11-19 15:18:07 +00:00
Laurent Cozic
ca20a2a1c2 Dropdown fioxes 2017-11-19 00:23:18 +00:00
Laurent Cozic
37c0b6d24a iOs tweaks 2017-11-19 00:03:42 +00:00
Laurent Cozic
0c14a42b28 RN: Replaced broken Picker by custom dropdown 2017-11-18 23:59:07 +00:00
Laurent Cozic
716b1315a9 Electron release v0.10.21 2017-11-17 23:42:45 +00:00
Laurent Cozic
409f2ca98d Electron: search 2017-11-17 18:57:27 +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
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
01d3bf8a11 Testing auto update 2017-11-13 23:04:27 +00:00
Laurent Cozic
48061457ac Various tweaks to get prod version to work 2017-11-13 18:47:35 +00:00
Laurent Cozic
2bb0b00136 Added app icon and other bug fixes 2017-11-13 17:51:46 +00:00
Laurent Cozic
7177ca21c9 Many changes and improvements 2017-11-13 00:23:12 +00:00
Laurent Cozic
2cf5234e76 Improved fetch with retry on all three platforms 2017-11-12 22:52:54 +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
26d1c0d79d Electron, Mobile: Fix image width 2017-11-12 17:58:28 +00:00
Laurent Cozic
6e75c93f3c Electron: styling 2017-11-12 17:53:26 +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
f9a06bb5b9 Electron: Save state of editor/viewer toggle 2017-11-12 17:02:20 +00:00
Laurent Cozic
e48d2ed64b Electron: Supports non-image files in notes 2017-11-12 16:33:34 +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
769df5b818 Fixed layout issues 2017-11-10 20:43:44 +00:00
Laurent Cozic
2b1d5ff726 Added title bar and fixed editor scrolling bug 2017-11-10 20:12:38 +00:00
Laurent Cozic
9b86eeacb3 Refactored Redux middleware and trigger sync after saving note 2017-11-10 18:58:00 +00:00
Laurent Cozic
e2cfd8a5af Disabled editor when no note is loaded 2017-11-10 17:58:17 +00:00
Laurent Cozic
5ddd1fc1b2 Fixed padding on top of editor 2017-11-10 00:07:37 +00:00
Laurent Cozic
fea29b95de Syntax highlighting on webview 2017-11-09 23:28:08 +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
7d12da27ad Prompt dialog and popup menu 2017-11-08 17:51:55 +00:00
Laurent Cozic
8bf85b6b88 Show editor and rendering side by side 2017-11-07 21:11:14 +00:00
Laurent Cozic
9e3af21e66 Optimised markdown rendering for mobile and electron 2017-11-07 18:39:11 +00:00
Laurent Cozic
5024dcf668 Improving markdown renderer 2017-11-06 23:56:33 +00:00
Laurent Cozic
26d9b57923 Got sync to work 2017-11-06 21:11:15 +00:00
Laurent Cozic
8dd41dca96 Added navigator and handle OneDrive auth 2017-11-06 18:35:04 +00:00
Laurent Cozic
d763b13e44 Split into generic and app-specific reducer 2017-11-06 18:05:12 +00:00
Laurent Cozic
7f625051ba Added sidebar 2017-11-05 23:55:01 +00:00
Laurent Cozic
100b98bff8 Saving/loading notes from Electron 2017-11-05 18:36:27 +00:00
Laurent Cozic
3de7534d1d Getting note HTML rendering to work 2017-11-05 16:51:03 +00:00
Laurent Cozic
09db5ff1d8 Refactor to re-use md rendering code in Electron app 2017-11-05 15:35:38 +00:00
Laurent Cozic
cc5bd12ba1 Moved code that can be shared between Electron and RN app to separate file 2017-11-05 00:49:23 +00:00
Laurent Cozic
dbf51382c8 Refactor to move state changes to browser process 2017-11-05 00:17:48 +00:00
Laurent Cozic
ec259f866f Created list that renders only currently visible items 2017-11-04 19:46:37 +00:00
Laurent Cozic
056c0dbab7 Various clean up and tweaks for Electron app 2017-11-04 13:23:15 +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
d601ed737b Got db and logger to working on Electron app 2017-11-04 11:26:49 +00:00
Laurent Cozic
28dcdc8984 Fixed switching of locale 2017-11-03 18:51:13 +00:00
Laurent Cozic
86ea826e18 Merge branch 'master' into no-babel 2017-11-03 17:11:52 +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
12b6902a49 Fixed RN text field and gave different OneDrive token to demo 2017-10-30 21:29:36 +00:00
Laurent Cozic
6675ea54ac RN: fixed visual glitches due to side menu being visible below other screens 2017-10-30 18:27:51 +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
57995b1818 Fixed folder selection and deletion issue 2017-10-29 16:22:53 +00:00
Laurent Cozic
e11670a872 Clean up and comment 2017-10-26 23:03:21 +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
31bfa72bca More info in case of error 2017-10-25 21:23:48 +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
13b4f3f4ea Display link to resources and display them via server. 2017-10-24 20:40:15 +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
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
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
dcacebf216 Fixed editing notes 2017-10-14 19:03:23 +01:00
Laurent Cozic
8c7cd8de88 Fixed updating view when note is deleted 2017-10-09 20:57:00 +01:00
Laurent Cozic
1abab26041 Improved UI usability 2017-10-08 23:34:01 +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
824b385e83 Various terminal gui changes 2017-10-07 17:30:27 +01:00
Laurent Cozic
fb0e8f36d4 Handle advanced options 2017-09-24 15:48:23 +01:00
Laurent Cozic
5118779a67 minor fixes 2017-09-12 18:01:15 +00:00
Laurent Cozic
7cc26a4fe4 Allow selecting note if ID matches more than one 2017-09-10 18:32:04 +01:00
Laurent Cozic
8e54404d28 Various changes 2017-09-10 17:57:06 +01:00
Laurent Cozic
7ac6f39658 Alarm support 2017-09-10 17:56:27 +01:00
Laurent Cozic
7aaf4fb491 Improved back button handling when note has been modified 2017-08-24 18:10:03 +00: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
1da06734f1 Various improvements on mobile app 2017-08-21 20:32:43 +02:00
Laurent Cozic
97c73b22d1 Fixed argument parsing 2017-08-21 19:56:40 +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
d708c8b48d Bigger click target on checkboxes 2017-08-19 23:59:08 +02:00
Laurent Cozic
a5daccce09 Per-target sync context 2017-08-19 22:56:28 +02:00
Laurent Cozic
0cf8d3fd74 Don't deal with files outside of root during OneDrive sync 2017-08-18 22:46:39 +02:00
Laurent Cozic
024be942a9 Clean up packages 2017-08-04 19:18:19 +02:00
Laurent Cozic
9ed22265ba Removed vorpal 2017-08-04 17:51:01 +00:00
Laurent Cozic
d9083fa2ed Fixed layout bug 2017-08-02 17:55:03 +00: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
7fe70696bb Preserve scroll position of Search screen 2017-08-01 21:08:38 +02:00
Laurent Cozic
4b54e3c2ea Made status page scrollable 2017-08-01 18:59:10 +00:00
Laurent Cozic
4d61ed1dce Various bug fixes 2017-08-01 18:53:50 +00:00
Laurent Cozic
88998bbe75 Fixed styling 2017-08-01 18:29:01 +00:00
Laurent Cozic
9ea95e8742 Fixed sync init 2017-08-01 18:14:47 +00:00
Laurent Cozic
cc54e32823 Support for dark/light theme 2017-08-01 17:59:01 +00:00
Laurent Cozic
a270a345d3 Improved app startup 2017-08-01 17:41:58 +00:00
Laurent Cozic
72c4ed8453 Fixed config page 2017-07-31 22:51:24 +02:00
Laurent Cozic
8ce02e6e4c Cache note list 2017-07-31 22:03:12 +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
2882aef8e4 Fixed multiple sync init issue 2017-07-31 18:32:51 +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
229fc4ed2e Make sure title height is correct with multi line text 2017-07-31 17:56:14 +00:00
Laurent Cozic
4761606330 Fixed list scroll position 2017-07-30 23:33:54 +02:00
Laurent Cozic
1a5720bd8c Styling 2017-07-30 23:04:26 +02:00
Laurent Cozic
242b6dbff8 Better handling of network errors 2017-07-30 22:22:57 +02:00
Laurent Cozic
ad1fbba78d Various fixes 2017-07-30 21:51:18 +02:00
Laurent Cozic
b81111743f More tweaks 2017-07-28 18:13:07 +00:00
Laurent Cozic
f228b48365 Various tweaks 2017-07-28 17:57:01 +00:00
Laurent Cozic
eb5d131620 Doc building 2017-07-27 23:59:34 +01:00
Laurent Cozic
d62aca7f50 Styling 2017-07-27 18:34:43 +01:00
Laurent Cozic
bd06fa781e Fixed note sorting and changed colour of header 2017-07-27 18:25:42 +01:00
Laurent Cozic
1cb23df869 Localization 2017-07-26 22:27:03 +01:00
Laurent Cozic
89f1d5e6e7 Minor CLI bug fixes and improvements 2017-07-26 22:07:27 +01:00
Laurent Cozic
76a9264239 Fixed sync cancel 2017-07-26 21:09:33 +01:00
Laurent Cozic
971c3e12dc Started support for onedrive tests 2017-07-26 21:00:16 +01:00
Laurent Cozic
3fad338e28 Html entity encoding 2017-07-26 20:00:52 +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
ce6ca38fa0 Save scroll position in notes 2017-07-25 21:24:30 +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
e2af824106 Moved sync scheduling to redux middleware 2017-07-25 18:41:53 +00:00
Laurent Cozic
621baf084b More clean up 2017-07-25 18:09:01 +00:00
Laurent Cozic
d47a02a24a Various clean up and optimisations 2017-07-25 17:49:31 +00:00
Laurent Cozic
80ad3e0dfd Screen titles 2017-07-24 22:58:14 +01:00
Laurent Cozic
53d305eb2e Various fixes 2017-07-24 22:52:30 +01: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
cfa3c6f4bb Fixed display of todos 2017-07-24 21:14:25 +01:00
Laurent Cozic
3e1decdfa6 sync in bg 2017-07-24 19:47:01 +00: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
1c3bf21539 Added search page 2017-07-22 23:52:24 +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
4f7edf8371 Background sync support 2017-07-22 18:35:39 +01:00
Laurent Cozic
7c60e32e64 Open links in browser 2017-07-22 18:21:39 +01:00
Laurent Cozic
7aee903ca2 Styling 2017-07-22 17:36:55 +01:00
Laurent Cozic
cbe0859496 More styling 2017-07-22 16:55:09 +01:00
Laurent Cozic
840980dafd More styling 2017-07-21 23:42:24 +01:00
Laurent Cozic
29b607fac6 Icons and styling 2017-07-21 22:40:02 +01:00
Laurent Cozic
aee3e9e4bf Return last context on error 2017-07-20 21:15:28 +01:00
Laurent Cozic
f529b9e3b9 Support for RN localisation 2017-07-19 22:26:30 +01:00
Laurent Cozic
5ca8647d35 Sync fixes 2017-07-19 20:15:55 +01:00
Laurent Cozic
df3e5ac40c Table rendering 2017-07-18 23:57:22 +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
6c75345435 Translated to French 2017-07-18 18:49:47 +00:00
Laurent Cozic
f835ea74a4 Locale support 2017-07-18 18:04:47 +00:00
Laurent Cozic
e19ed03b90 Made dispatching of sync events more consistent 2017-07-17 23:43:29 +01:00
Laurent Cozic
268dfec554 Fixed sync issue with conflicted notes 2017-07-17 23:22:22 +01:00
Laurent Cozic
cd184e26d0 Made checkboxes clickable 2017-07-17 22:34:08 +01:00
Laurent Cozic
ca68b85837 Fixed various issue in RN app 2017-07-17 21:22:05 +01:00
Laurent Cozic
58fa4a69b0 Started adding support for localisation 2017-07-17 20:26:19 +00: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
15e95bb0ab Minor changes on CLI 2017-07-17 18:46:09 +00:00
Laurent Cozic
6673baee91 Sync in background for RN 2017-07-16 22:17:22 +01:00
Laurent Cozic
576cb345bb Auto capitalise in text inputs 2017-07-16 17:31:42 +01:00
Laurent Cozic
f600689323 Remove old log entries 2017-07-16 17:20:25 +01: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
cd6d8ce284 Fixed geolocation bug and improved saving of notes and folders 2017-07-16 11:17:40 +01:00
Laurent Cozic
e2d426a986 Button styling 2017-07-16 00:30:54 +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
472dee05ea Folder button styling 2017-07-15 19:56:24 +01:00
Laurent Cozic
69d85432ed Better handling of folder screen 2017-07-15 19:37:17 +01:00
Laurent Cozic
0100c2fff5 Refactored multi-state button 2017-07-15 19:21:39 +01:00
Laurent Cozic
93791f1e46 Fixed note order in RN 2017-07-15 19:13:31 +01:00
Laurent Cozic
62c9a66c47 Better handling of todos in RN 2017-07-15 18:08:54 +01:00
Laurent Cozic
e3db1e028a Handle reserved names in RN 2017-07-15 17:25:33 +01:00
Laurent Cozic
0e05567706 VArious fixes 2017-07-15 17:14:15 +01:00
Laurent Cozic
aabc58224a RN: Better UI to handle conflicts 2017-07-15 16:54:19 +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
f840dd505f Simplified sync logging and reporting 2017-07-14 19:06:01 +00:00
Laurent Cozic
18b5453146 implemented own navigator 2017-07-14 18:49:14 +00:00
Laurent Cozic
4dc540e589 Minor changes 2017-07-14 18:02:45 +00:00
Laurent Cozic
2142c4aaf0 Improved edit/save note 2017-07-14 00:35:37 +01:00
Laurent Cozic
01fb866835 Better rendering of markdown notes 2017-07-13 23:20:08 +01:00
Laurent Cozic
3b5ecc7592 Improved navigation 2017-07-13 22:50:21 +01: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
e397ad197d Fixed OneDrive connection issue 2017-07-13 18:09:47 +00:00
Laurent Cozic
bde42a80b6 Various RN changes 2017-07-13 00:01:15 +01:00
Laurent Cozic
d92f1c7eba various changes 2017-07-12 23:32:08 +01: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
4fa65de31d Fixed various bugs 2017-07-11 00:17:03 +01:00
Laurent Cozic
4adc9b30fb Dismiss keyboard 2017-07-10 22:44:55 +01:00
Laurent Cozic
70c75af225 Render markdown 2017-07-10 22:34:26 +01:00
Laurent Cozic
729235bf3c bug fix 2017-07-10 21:48:17 +01: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
5a434bb771 Better handling of items with same names 2017-07-10 20:47:01 +00:00
Laurent Cozic
cb30035060 Moved commands to separate files 2017-07-10 20:03:46 +00:00
Laurent Cozic
e0184d94c8 Load commands dynamically 2017-07-10 18:17:03 +00:00
Laurent Cozic
f3d8c34499 Clean up 2017-07-10 18:09:58 +00:00
Laurent Cozic
fdeb797750 Fixed bad connection handling in synchronizer 2017-07-10 00:20:38 +01:00
Laurent Cozic
dc4eb35fca Fixed multiple instance issue 2017-07-09 23:57:15 +01:00
Laurent Cozic
297edfa682 Allow cancelling sync and fixed resource issue 2017-07-09 16:47:05 +01:00
Laurent Cozic
de16573742 Clean up 2017-07-09 11:17:21 +01:00
Laurent Cozic
4b44a8a782 Improved nav 2017-07-09 00:57:30 +01:00
Laurent Cozic
53c23b1149 history fix 2017-07-09 00:46:25 +01:00
Laurent Cozic
e9f0d38a80 Improved init sequence 2017-07-08 23:57:09 +01:00
Laurent Cozic
a9f7b0d531 Various changes 2017-07-08 00:25:10 +01:00
Laurent Cozic
38c9d49cdb Various changes 2017-07-07 23:25:03 +01:00
Laurent Cozic
e0664167eb Log screen in RN app 2017-07-07 18:19:24 +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
5802adc9f1 getting sync work in RN 2017-07-06 19:48:17 +00:00
Laurent Cozic
1c6b569795 Making oneDrive work on RN 2017-07-06 19:29:09 +00:00
Laurent Cozic
bdb250de8a Make fetch and FormData work in both RN and node 2017-07-06 18:58:01 +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
Laurent Cozic
e323a86563 Various changes 2017-07-04 19:12:30 +00:00