2304 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
azivner	719f553054	fixed removing from recent notes	2017-11-30 00:08:59 -05:00
azivner	7c7a5f19f5	better algorithm to find note if note path is invalid	2017-11-30 00:02:32 -05:00
azivner	d0a0366b05	more complete support for network-less electron frontend-backend communication including protected session	2017-11-29 23:30:35 -05:00
azivner	8bd76721ad	prefixes are now displayed also in all autocompletes and recent notes	2017-11-29 22:03:03 -05:00
azivner	69f77ac439	update note title in tree real time instead of waiting for save event	2017-11-29 21:13:12 -05:00
azivner	e6629b2c93	cosmetic sync related changes	2017-11-29 21:04:30 -05:00
azivner	6d603eda86	drop links and images tables	2017-11-29 20:48:58 -05:00
azivner	3386cd790e	cleaned up images and links which are not used nor supported	2017-11-29 20:47:01 -05:00
azivner	d019d0a690	Merge branch 'master' into stable	2017-11-29 20:30:56 -05:00
azivner	e47027cbef	recent notes are kept only for one day	2017-11-29 20:30:47 -05:00
azivner	a9460957da	prototype of executing requests without network calls in electron	2017-11-28 22:01:02 -05:00
azivner	54c0ff15b3	using server.method() instead of direct call to $.ajax - preparation for electron without network requests	2017-11-28 20:52:38 -05:00
azivner	14001f67d8	fix updating note title when switching to another note	2017-11-28 19:38:33 -05:00
azivner	cd90200272	fixed sync	2017-11-28 18:33:23 -05:00
azivner	91c2f9e7cb	websocket stuff separated into messaging.js	2017-11-28 17:52:47 -05:00
azivner	3d84f5c3b0	synchronization of transactions using promise so only one can be active	2017-11-28 17:24:08 -05:00
azivner	fd764f6163	separate DB connection for each transaction (just for the record, will be reverted probably)	2017-11-28 17:04:47 -05:00
azivner	4d95eb0762	some fixes in note moving	2017-11-28 15:17:11 -05:00
azivner	0cab4e3edd	CTRL-C CTRL-V now clones the note	2017-11-28 11:36:32 -05:00
azivner	7038636d2e	fix setting title	2017-11-28 10:17:30 -05:00
azivner	40a522a9aa	alt-l shouldn't bring up edit tree prefix dialog	2017-11-27 18:19:04 -05:00
azivner	b809971fd1	using dotted underlining for cloned notes because dashed looks ugly in chrome	2017-11-27 18:16:42 -05:00
azivner	1231e02449	show 0 changes to sync for instances without configured sync	2017-11-26 23:16:47 -05:00
azivner	8b5988e13c	sync fix to prefix and some usability improvements	2017-11-26 23:10:23 -05:00
azivner	37a105db4d	fix prefix when renaming note	2017-11-26 22:40:14 -05:00
azivner	160c1c455c	initial implementation of tree prefix	2017-11-26 22:34:25 -05:00
azivner	b4e6245f7b	fix	2017-11-26 21:00:42 -05:00
azivner	9fcafe44d5	fix	2017-11-26 19:56:08 -05:00
azivner	a92df38479	tweaks to time values	2017-11-26 17:04:18 -05:00