367 Commits

Author	SHA1	Message	Date
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	1891eb4998	All: Upgraded to fs-extra 5.0	2017-12-22 18:58:09 +00: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	75f8234db5	All: Added Russian translation. Thanks @rtmkrlv	2017-12-17 12:34:56 +01:00
Laurent Cozic	4e41731c08	All: Updated translations	2017-12-17 12:30:32 +01:00
Laurent Cozic	5780951f7d	Updated translations	2017-12-15 08:46:30 +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	ee02f8255e	All: Encryption setup on apps	2017-12-13 19:01:04 +00:00
Laurent Cozic	c3fbcb8feb	Update website	2017-12-11 21:20:49 +00:00
Laurent Cozic	d56b247adf	Electron release v0.10.39	2017-12-11 20:09:38 +00:00
Laurent Cozic	a59bf55c16	Electron: Fixes #3: Paths with '.' would cause JSX compilation to fail	2017-12-10 16:06:43 +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	931083b2e2	Electron: Fixes #86: App icon missing on Linux	2017-12-10 14:04:07 +00:00
Laurent Cozic	0f343bccda	Electron: resolve #7: Show storage location in Options screen	2017-12-08 21:51:59 +00:00
Laurent Cozic	353b79f5e5	Electron release v0.10.38	2017-12-07 23:25:06 +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	3227a13035	Electron release v0.10.37	2017-12-07 18:00:28 +00:00
Laurent Cozic	027f96d100	Electron: Fixes #36: Set installation directory for Windows installer	2017-12-07 18:17:41 +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	8838017830	All: Updated translations	2017-12-06 23:55:22 +00:00
Laurent Cozic	f42908b11c	Merge branch 'sync-limits'	2017-12-05 17:30:16 +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	304b9a582f	Electron release v0.10.36	2017-12-04 23:57:30 +00:00
Laurent Cozic	4d5c4b1743	Electron: started unsynchronisable items UI	2017-12-04 23:57:13 +00:00
Laurent Cozic	ab8c66a361	Updated tools	2017-12-04 18:16:14 +00:00
Laurent Cozic	8eb5f8b74e	Electron release v0.10.35	2017-12-02 15:18:23 +00:00
Laurent Cozic	581372de0b	Electron release v0.10.34	2017-12-02 14:26:55 +00:00
Laurent Cozic	9854fddeb2	Electron release v0.10.33	2017-12-02 12:50:52 +00:00
Laurent Cozic	cd1e7a1083	Electron release v0.10.32	2017-12-02 00:21:29 +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	ff502670bf	Updated Readme, mentioned Homebrew	2017-12-01 20:06:20 +00:00
Laurent Cozic	ec50808ba1	Merge branch 'master' of github.com:laurent22/joplin	2017-12-01 19:15:56 +00:00
Laurent Cozic	33fd8325be	Electron: Fix #33: Allow copy and paste in OneDrive login	2017-12-01 19:15:46 +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	fe909f659d	All: Added error message for OneDrive for Business	2017-12-01 17:47:18 +00:00
Laurent Cozic	65739a5077	Update website	2017-12-01 09:57:32 +00:00
Laurent Cozic	228d06e27f	Electron release v0.10.31	2017-12-01 00:00:33 +00:00
Laurent Cozic	e1b1f31cf1	Electron: #22 Fixes keyboard cursor jumps while typing.	2017-12-01 00:00:18 +00:00
Laurent Cozic	2ef2296566	Update website	2017-11-30 20:30:01 +00:00
Laurent Cozic	04ed914894	Electron release v0.10.30	2017-11-30 18:53:35 +00:00
Laurent Cozic	332dd0d859	Merge branch 'alarm-support'	2017-11-30 18:53:26 +00:00
Laurent Cozic	3ec59a835c	Electron release v0.10.29	2017-11-30 18:44:53 +00:00
Laurent Cozic	620225bb2d	Electron: Fixed copy/cut/paste problem in macOS	2017-11-30 18:44:37 +00:00
Laurent Cozic	9d7d469908	Electron: Fixed option page checkboxes	2017-11-30 18:36:26 +00:00
Laurent Cozic	16bf0cf646	All: Added Spanish (Costa Rica) locale	2017-11-30 18:29:10 +00:00
Laurent Cozic	28143db968	Electron release v0.10.28	2017-11-30 00:25:59 +00:00
Laurent Cozic	7f1a14fa22	All: Fixed note update issue	2017-11-30 00:25:52 +00:00
Laurent Cozic	4de1edda05	Electron release v0.10.27	2017-11-29 23:27:28 +00:00
Laurent Cozic	52f09d2638	Electron: Fixed import of certain images	2017-11-29 23:27:20 +00:00
Laurent Cozic	52cb10dd4e	Electron: added toolbar and fixed various state issues	2017-11-29 23:03:10 +00:00
Laurent Cozic	a346116d5f	Update website	2017-11-29 16:03:19 +00:00
Laurent Cozic	5ee9a35f7d	Electron release v0.10.26	2017-11-29 15:32:41 +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	ddb73c8642	iOS: Fixed notification event	2017-11-28 20:23:22 +00:00
Laurent Cozic	fa22d5bae3	Electron: Fixed getting package info	2017-11-28 19:53:29 +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	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	112609c5f1	All: Moving sync target logic to SyncTarget classes	2017-11-24 18:59:16 +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	f52ff730b1	Disable cache	2017-11-23 19:29:03 +00:00
Laurent Cozic	05997908e5	Electron release v0.10.25	2017-11-23 19:05:37 +00:00
Laurent Cozic	2a93dea378	Electron release v0.10.24	2017-11-23 19:04:56 +00:00
Laurent Cozic	acc4eb5d28	Mobile: Allow selecting, deleting and moving multiple notes	2017-11-23 18:47:51 +00:00
Laurent Cozic	bcd5cd9110	Electron: Hide invalid characters	2017-11-23 18:16:17 +00:00
Laurent Cozic	5340fb8af9	Electron: Disable Control+Click	2017-11-22 19:29:49 +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	cf832354a2	Updated website	2017-11-21 19:43:09 +00:00
Laurent Cozic	27af0e69ef	Electron release v0.10.23	2017-11-21 18:26:17 +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	f5feb595f6	Updated translation	2017-11-21 19:14:30 +00:00
Laurent Cozic	b0b5488c2e	Electron: Better error handling for auto-update	2017-11-21 18:59:32 +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	ab8115b89d	Added download badges	2017-11-20 22:28:22 +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	a057fbf3bd	Electron: added sync icon	2017-11-20 18:44:56 +00:00
Laurent Cozic	3d6fe4c2cd	Android: Fixed image picker issues	2017-11-20 19:01:19 +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	504c3d4c0d	Updating website	2017-11-17 19:07:32 +00:00
Laurent Cozic	9e77f01088	Updating Readme	2017-11-17 19:05:12 +00:00
Laurent Cozic	409f2ca98d	Electron: search	2017-11-17 18:57:27 +00:00
Laurent Cozic	2bfaa0e02c	Merge branch 'master' of github.com:laurent22/joplin	2017-11-17 11:05:41 +00:00
Laurent Cozic	209f2cae55	Electron: Handle hide/show app logic for macOS	2017-11-17 18:05:25 +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	056741e2c2	Electron release v0.10.20	2017-11-16 22:33:57 +00:00
Laurent Cozic	01ba0c3078	Fixed image upload for Linux and macOS	2017-11-16 22:33:45 +00:00
Laurent Cozic	4bb9be8f78	Electron release v0.10.19	2017-11-16 19:32:12 +00:00
Laurent Cozic	092c09065f	Merge branch 'master' of github.com:laurent22/joplin	2017-11-16 20:31:55 +01:00
Laurent Cozic	fcc2eb6354	Fix for Linux icons	2017-11-16 20:31:43 +01:00
Laurent Cozic	94a800aa3c	Electron release v0.10.18	2017-11-16 19:21:23 +00:00
Laurent Cozic	add69aa210	Version v0.10.17	2017-11-16 18:52:00 +00:00
Laurent Cozic	5098c03264	Allow setting extra flags and renaming folder	2017-11-16 18:51:11 +00:00
Laurent Cozic	eacd0e5cfd	Linux icons	2017-11-16 18:45:01 +00:00
Laurent Cozic	e799062059	Version v0.10.16	2017-11-16 12:20:45 +00:00
Laurent Cozic	96a2aa6ad8	Mac icons	2017-11-16 12:20:25 +00:00
Laurent Cozic	82674e8bdb	Merge branch 'master' of github.com:laurent22/joplin	2017-11-16 12:11:01 +00:00
Laurent Cozic	667f5c0cfe	mac update	2017-11-16 12:10:57 +00:00
Laurent Cozic	fca504d552	Version v0.10.15	2017-11-16 11:45:42 +00:00
Laurent Cozic	af78721568	Version v0.10.14	2017-11-16 11:42:06 +00:00
Laurent Cozic	9a10984e84	testing	2017-11-16 11:37:46 +00:00
Laurent Cozic	462a676442	update	2017-11-16 11:23:50 +00:00
Laurent Cozic	a2a714461c	Merge branch 'master' of github.com:laurent22/joplin	2017-11-16 11:23:19 +00:00
Laurent Cozic	dfc5845025	Disable asar	2017-11-16 18:03:01 +00:00
Laurent Cozic	2bca9af9a7	Fixing macOS and Linux builds	2017-11-15 23:38:56 +00:00
Laurent Cozic	8b7ed05d7b	Release 10.0.7	2017-11-15 22:43:35 +00:00
Laurent Cozic	35b9835fd5	Exclude build files	2017-11-14 23:05:35 +00:00
Laurent Cozic	11ad6c6bef	Removing need for including build files	2017-11-14 23:01:19 +00:00
Laurent Cozic	c838548831	Unversioning build files	2017-11-14 20:58:40 +00:00
Laurent Cozic	dbb5599b0f	Save window state	2017-11-14 18:02:58 +00:00
Laurent Cozic	bf916d5b9b	Trying auto update	2017-11-14 11:18:15 +00:00
Laurent Cozic	9c610963b2	Trying auto update	2017-11-14 10:54:16 +00:00
Laurent Cozic	7b1e913651	Trying auto update	2017-11-14 10:53:18 +00:00
Laurent Cozic	e8d7050279	Trying auto update	2017-11-14 10:18:18 +00:00
Laurent Cozic	0e01011afc	Trying update	2017-11-13 23:13:40 +00:00
Laurent Cozic	01d3bf8a11	Testing auto update	2017-11-13 23:04:27 +00:00
Laurent Cozic	cfa4da39e5	Added optional dependency 7zip-bin-linux	2017-11-13 22:49:09 +00:00
Laurent Cozic	48061457ac	Various tweaks to get prod version to work	2017-11-13 18:47:35 +00:00
Laurent Cozic	63c3636151	Testing	2017-11-13 17:21:49 +00:00
Laurent Cozic	e2ad0be555	Added files required for build	2017-11-13 14:44:22 +00:00
Laurent Cozic	b5f663de8b	Add locales	2017-11-13 14:35:07 +00:00
Laurent Cozic	6149ca575e	Update package.json	2017-11-13 13:20:35 +00:00
Laurent Cozic	7e19f99bbb	Update package.json	2017-11-13 13:14:38 +00:00
Laurent Cozic	e74e717e2a	Trying build	2017-11-13 12:16:10 +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	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	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	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	6b3bda2941	Added application menu	2017-11-11 12:00:37 +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	bbb9d8d492	Improved rendering of checkboxes	2017-11-10 18:20:14 +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