1683 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zadam	1aca42979e	licensing under AGPL v3	2017-12-10 21:13:39 -05:00
azivner	8a3ea412f9	use protect/unprotect terminology in button	2017-12-10 15:47:21 -05:00
azivner	f68ffe1581	fixes for dates in sync	2017-12-10 15:45:17 -05:00
azivner	cba457bd61	using ISO8601 format instead of custom	2017-12-10 15:31:43 -05:00
azivner	021f02bd8c	converted all timestamps to string representation	2017-12-10 12:56:59 -05:00
azivner	e3b708c322	expanding server request timeout for long tree requests	2017-12-10 00:02:13 -05:00
azivner	2fdd4c37e5	using change event instead of changesDone because the latter seems to trigger also on e.g. just selection	2017-12-09 21:56:48 -05:00
azivner	7483f11d10	more consistent handling of tree data structures when creating new note	2017-12-09 21:53:21 -05:00
azivner	3abbe2d970	realoding tree after deletion (too many changes in data model)	2017-12-09 21:42:22 -05:00
azivner	f55f0a4ed3	make sure entity IDs are generated only with alphanumeric characters (base62)	2017-12-09 20:44:06 -05:00
azivner	372cce8f8e	fixed "add date" for ckeditor	2017-12-09 14:17:03 -05:00
azivner	5001e7e630	removed summernote	2017-12-09 14:12:56 -05:00
azivner	d2a5921489	add links in ckeditor	2017-12-09 14:11:35 -05:00
azivner	7ca043ebc6	Merge branch 'master' into ckeditor	2017-12-09 11:56:36 -05:00
azivner	4187ff36fb	generating all IDs with secure method (important now since it's used as salt for encryption)	2017-12-07 22:57:39 -05:00
azivner	b81f1ed93a	fix saving history for encrypted notes	2017-12-06 23:39:43 -05:00
azivner	6fad30e9af	renamed start_note_tree_id option to startNotePath	2017-12-06 23:15:53 -05:00
azivner	f1256423ac	fix handling of note history - when saving note history we save previous state, not current	2017-12-06 22:31:28 -05:00
azivner	4f47c4d6e9	better fix for migration in electron + electron upgrade to 1.8.2 beta 3	2017-12-06 21:15:46 -05:00
azivner	bbd1774815	fix migration in electron build	2017-12-06 20:58:59 -05:00
azivner	d467fbdff3	better styling of parent list	2017-12-06 20:19:41 -05:00
azivner	0c6521545a	fix for cloned notes at root level + better logging	2017-12-06 20:11:45 -05:00
azivner	a0bbd8c853	throwException instead of throwing exceptions manually (includes stacktrace)	2017-12-06 19:53:23 -05:00
azivner	a7831ebfcd	log data dir location	2017-12-06 19:42:23 -05:00
azivner	23e8e20d44	border around tree actions	2017-12-04 18:40:18 -05:00
azivner	33ab709209	spacing between action buttons and pointer cursor	2017-12-04 18:21:57 -05:00
azivner	3789ead2da	creating new starting page when creating database	2017-12-04 00:17:08 -05:00
azivner	6546548848	implemented initial setup of the app	2017-12-03 22:29:23 -05:00
azivner	a3f57622ff	distinguishing between when DB is just connected and when it's ready for queries (validated)	2017-12-03 19:18:33 -05:00
azivner	502e5cbbdf	Merge branch 'master' into ckeditor	2017-12-03 17:47:40 -05:00
azivner	3a26054619	fixes to recent changes	2017-12-03 17:46:56 -05:00
azivner	34f1eb930c	recent notes are reloaded if synced	2017-12-03 10:42:23 -05:00
azivner	28bc443914	using WSS protocol when on HTTPS instead of WS	2017-12-03 10:12:16 -05:00
azivner	15faefe8a3	recent notes are now keyed by note tree id which simplifies things	2017-12-03 10:06:53 -05:00
azivner	41f089b3f4	pretty printing HTML output (for nice git diffs)	2017-12-03 09:19:48 -05:00
azivner	ddd216c92e	export with pos in filename and import so we preserve note order	2017-12-03 00:10:43 -05:00
azivner	cd3c6d7e3b	note import from directory	2017-12-02 23:41:18 -05:00
azivner	119d085856	export subtree to filesystem	2017-12-02 21:48:22 -05:00
azivner	7b6ccab894	some fixes for CKEditor	2017-12-02 13:54:16 -05:00
azivner	a85bb649cb	basic CKEditor integration	2017-12-02 10:37:12 -05:00
azivner	0521deb304	unifying API paths to lower-case	2017-12-01 22:47:23 -05:00
azivner	cba9d8b5c1	logging JS errors to backend logs	2017-12-01 22:28:22 -05:00
azivner	02e5d20d44	https support (with custom ca) for sync	2017-12-01 20:39:48 -05:00
azivner	07070e2222	grey-scaled loading circles	2017-11-30 23:56:11 -05:00
azivner	0bd5296aa1	multiline style (but still colored)	2017-11-30 23:53:15 -05:00
azivner	ff3f14c3e2	websocket requires logged in session in upgrade request	2017-11-30 23:50:42 -05:00
azivner	5f3a11af47	even though trilium APIs are still exposed in electron, they require login if not called directly from electron	2017-11-30 23:29:21 -05:00
azivner	81719f84a0	not creating note history immediatelly after creating a note since it's empty at that point which is useless	2017-11-30 22:49:40 -05:00
azivner	471821ebe5	separated electron routing into separate file	2017-11-30 20:51:35 -05:00
azivner	7bdf269095	migration now works also in electron	2017-11-30 19:58:00 -05:00