self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-15 09:04:04 +02:00
Code Issues Releases Activity
3,058 Commits 245 Branches 1,265 Tags 667 MiB
b9e5c8a387
Commit Graph

388 Commits

Author SHA1 Message Date
Laurent Cozic
4046a51472 Electron: Handle import export 2018-02-27 20:04:38 +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
3691ae4d13 Electron: Fixes #217: Display a message when the note has no content and only the note viewer is visible 2018-02-19 18:56:56 +00:00
Laurent Cozic
4218b65969 Electron: Added several keyboard shortcuts 2018-02-16 18:08:02 +00:00
Laurent Cozic
214a39c3d3 All: Improved the way settings are changed. Should also fixed issue with sync context being accidentally broken. 2018-02-13 18:26:33 +00:00
Laurent Cozic
b179471eff Electron: Fixes #205: Importing Evernote notes while on import page re-imports previous import 2018-02-11 20:31:26 +00:00
Laurent Cozic
acf0c79341 Graduated E2EE and WebDAV from beta, and moved to v1.0 2018-02-11 13:50:59 +00:00
Laurent Cozic
78e5eaf1e2 Electron: Toolbar button to set tags 2018-02-07 20:35:11 +00:00
Laurent Cozic
fc0d227396 Electron: Allowing opening and saving resource images 2018-02-07 20:23:17 +00:00
Laurent Cozic
5cab7aeb55 Fixed: Make sure alarms and resources are attached to right note when creating new note 2018-02-06 19:31:22 +00:00
Laurent Cozic
fa5f418c22 All: Added sync config check to config screens 2018-02-06 18:59:36 +00:00
Laurent Cozic
a25fcacace Electron: Display message when creating new note or to-do 2018-02-06 18:12:43 +00:00
Laurent Cozic
8b7f5b1151 Fix scrolling issue in Electron app 2018-02-04 18:45:52 +00:00
Laurent Cozic
b4dce0ed46 All: Added Katex support 2018-02-04 17:12:24 +00:00
Laurent Cozic
fad96f5266 All: Added section to list missing master keys 2018-02-01 19:01:20 +00:00
Laurent Cozic
c52da82447 Electron: Fix: Don't allow adding notes and to-do to conflict notebook 2018-01-31 20:19:11 +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
5a9e0bfc26 Handle password text input in mobile and desktop 2018-01-25 22:44:09 +00:00
Laurent Cozic
fd29f20b2e Electron: Fix checkbox issue in config screen 2018-01-23 18:31:49 +00:00
Laurent Cozic
511bd57726
Merge pull request #175 from alexdevero/add-font-size-settings 
Add font size settings
 2018-01-23 11:25:47 +00:00
Laurent Cozic
86eee376bb All: Handle case where resource blob is missing during sync 2018-01-21 17:48:50 +00:00
Alex Devero
1da19ae98d Fix indentation 2018-01-19 14:11:40 +01:00
Alex Devero
f52c117b09 Add font size settings 2018-01-19 13:27:44 +01: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
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
c2a0d8600f Electron: Move prompt to top to avoid issue with date picker being hidden 2018-01-09 21:06:47 +01:00
Laurent Cozic
ede3c2ce2f Electron: Fixed display of too long notebook titles 2018-01-09 19:34:06 +01:00
Laurent Cozic
2f13e689b9 Electron: Don't scroll back to top when note is reloaded via sync 2018-01-09 20:26:20 +00:00
Laurent Cozic
ea135a0d28 Electron: Fixed logic of what note is used when right-clicking one or more notes 2018-01-09 20:16:09 +00: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
cc2f665313 Electron: Undone tests 2018-01-08 10:57:29 +01:00
Laurent Cozic
8de5b4219d All: Updated translations 2018-01-06 21:05:34 +01:00
Laurent Cozic
d659d975cd All: Documentation and minor tweaks for E2EE 2018-01-05 18:40:57 +01:00
Laurent Cozic
0115e74163 All: Minor tweaks regarding encryption 2017-12-04 19:29:34 +00:00
Laurent Cozic
6252a4d8c8 Merge branch 'master' into encryption 2018-01-03 20:23:26 +01:00
Laurent Cozic
500fbc5294 Merge branch 'master' into encryption 2017-12-31 15:26:16 +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
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
70b03971f6 All: Fixed handling of unloaded master key 2017-12-22 18:50:27 +00:00
marcosvega91
38c050b47e Removed duplicate editor variable 2017-12-22 15:43:01 +01:00
marcosvega91
0bf5c9ebdd Fix #119 
Fix the bug that permit to undo changes from different notes.
I save the editor instance into the state and in the componentWillReceiveProps i reset the undo state
 2017-12-22 14:48:44 +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
4c0b472f67 All: Testing and better handling of E2EE initialisation 2017-12-17 20:51:45 +01:00
Laurent Cozic
4e41731c08 All: Updated translations 2017-12-17 12:30:32 +01: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
42e34b5c3b All: Fixes #87: Show warningn when deleting notebook that contains notes. 2017-12-10 14:09:12 +00:00
Laurent Cozic
0f343bccda Electron: resolve #7: Show storage location in Options screen 2017-12-08 21:51:59 +00:00
Laurent Cozic
6f97747199 Electron: Add support for file system sync 2017-12-07 22:29:02 +00:00
Laurent Cozic
bad4b2ecb8 Electron: Added dialog to export sync status 2017-12-07 21:18:18 +00:00
Laurent Cozic
c1ff820913 Electron: Fixes #65: Display 'no notebook' message on startup. 2017-12-07 13:16:38 +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
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
4d5c4b1743 Electron: started unsynchronisable items UI 2017-12-04 23:57:13 +00:00
Laurent Cozic
4dce9e9e47 Electron: Allow attaching multiple files 2017-12-01 23:26:08 +00:00
Laurent Cozic
aef2e4845d Electron: Fixes #32: Error when manually input alarm date 2017-12-01 21:55:02 +00:00
Laurent Cozic
ede1ed8b22 macOS: Allow BACKSPACE instead of DELETE in CLI app 2017-12-01 18:56:35 +00:00
Laurent Cozic
e1b1f31cf1 Electron: #22 Fixes keyboard cursor jumps while typing. 2017-12-01 00:00:18 +00:00
Laurent Cozic
9d7d469908 Electron: Fixed option page checkboxes 2017-11-30 18:36:26 +00:00
Laurent Cozic
52cb10dd4e Electron: added toolbar and fixed various state issues 2017-11-29 23:03:10 +00:00
Laurent Cozic
bd73107853 Electron: Improved parsing of auth token 2017-11-28 21:36:04 +00:00
Laurent Cozic
2e8fe88f53 Don't needlessly reload resources 2017-11-28 21:15:22 +00:00
Laurent Cozic
444c96d5e7 Electron: Fixed scrolling issue 2017-11-28 20:58:07 +00:00
Laurent Cozic
f9f5974267 All: Added option to set date and time format 2017-11-28 18:02:54 +00:00
Laurent Cozic
9a40851c77 Electron, Mobile: Created alarm service and drivers 2017-11-27 22:50:46 +00:00
Laurent Cozic
946ad7c71a All: Started moving sync target logic under SyncTarget classes 2017-11-24 18:06:30 +00:00
Laurent Cozic
acc4eb5d28 Mobile: Allow selecting, deleting and moving multiple notes 2017-11-23 18:47:51 +00:00
Laurent Cozic
3ce1172c36 Allow changing notebook by drag and dropping notes 2017-11-22 19:20:19 +00:00
Laurent Cozic
e4d48f43d6 Allow multiple selection 2017-11-22 18:35:31 +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
a057fbf3bd Electron: added sync icon 2017-11-20 18:44:56 +00:00
Laurent Cozic
6f88c025f5 Update locale 2017-11-17 23:33:20 +00:00
Laurent Cozic
409f2ca98d Electron: search 2017-11-17 18:57:27 +00:00
Laurent Cozic
ce9da90846 Merge branch 'master' of github.com:laurent22/joplin 2017-11-17 11:02:39 +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
01ba0c3078 Fixed image upload for Linux and macOS 2017-11-16 22:33:45 +00:00
Laurent Cozic
5098c03264 Allow setting extra flags and renaming folder 2017-11-16 18:51:11 +00:00
Laurent Cozic
11ad6c6bef Removing need for including build files 2017-11-14 23:01:19 +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
e2ad0be555 Added files required for build 2017-11-13 14:44:22 +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
71a97bd45b Don't allow deleting sync folder 2017-11-12 18:59: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
f8bcb56964 Electron: update note in view when sync update note 2017-11-12 18:12:05 +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
2879e616c1 Electron: Change title when changing screen 2017-11-12 16:47:33 +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
61890d99ec Change dir 2017-11-10 22:27:38 +00:00
Laurent Cozic
49c11fb22e Allow attaching files in Electron ap 2017-11-10 22:18:00 +00:00
Laurent Cozic
f543015714 Layout and styling 2017-11-10 21:04:53 +00:00
Laurent Cozic
769df5b818 Fixed layout issues 2017-11-10 20:43:44 +00:00
Laurent Cozic
43dff9362a Created new todo button, and option to switch is_todo 2017-11-10 20:34:36 +00:00
Laurent Cozic
2b1d5ff726 Added title bar and fixed editor scrolling bug 2017-11-10 20:12:38 +00:00
Laurent Cozic
21f50a14c5 Handle todo checkbox from list 2017-11-10 20:11:48 +00:00
Laurent Cozic
00084e398c Switched to FontAwesome for the icons, and implemented editor/viewer toggle 2017-11-10 19:18:19 +00:00
Laurent Cozic
9b86eeacb3 Refactored Redux middleware and trigger sync after saving note 2017-11-10 18:58:00 +00:00
Laurent Cozic
17309b0fac Clean up and improve loading of hl.js 2017-11-10 18:43:54 +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
d4a0f7791a Use ACE for Markdown syntax highlighting in editor 2017-11-09 22:44:10 +00:00
Laurent Cozic
0806530fd9 Styling 2017-11-09 19:21:10 +00:00
Laurent Cozic
e6f9e2663d More styling 2017-11-08 22:48:19 +00:00
Laurent Cozic
26deb2ceb4 Styling 2017-11-08 22:23:26 +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
b9194e94aa Electron: Fixes #84: Fields losing focus in Config screen 2017-11-08 11:41:23 +00:00
Laurent Cozic
5a7fde7d21 Auto save note 2017-11-07 21:46:23 +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
c1cb020283 Made header 2017-11-06 20:54:58 +00:00
Laurent Cozic
8dd41dca96 Added navigator and handle OneDrive auth 2017-11-06 18:35:04 +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
cc277018b7 Added NoteText component 2017-11-04 23:27:13 +00:00
Laurent Cozic
ec259f866f Created list that renders only currently visible items 2017-11-04 19:46:37 +00:00
Laurent Cozic
18bb02244f Started note list 2017-11-04 16:40:34 +00:00