323 commits

Author	SHA1	Message	Date
zadam	c72ea2ed60	changes in retrieval of initial note tree and then updates	2019-10-25 21:47:14 +02:00
zadam	4570319517	WS debugging messages and small changes	2019-10-24 23:02:29 +02:00
zadam	ec7c0f0723	added sync mutex to ping messages	2019-10-22 21:59:51 +02:00
zadam	358fd13c8d	small refactorings	2019-10-20 13:09:00 +02:00
zadam	1903c59163	scripts should have different sourceId	2019-10-19 15:12:25 +02:00
zadam	6d5762fac8	open update to 7.0	2019-10-16 19:42:42 +02:00
zadam	22c4859d42	grey out archived items in the tree	2019-10-15 19:16:44 +02:00
zadam	2ee94a3a69	changed import progress notification so it shows up for drag & drop as well	2019-10-14 10:31:58 +02:00
zadam	7dc793920f	fix spellcheck build on windows	2019-10-10 23:24:25 +02:00
zadam	98a6670cb4	prevent default context menu on tab right click, closes #656	2019-10-10 19:34:55 +02:00
zadam	0835930a8a	fix creating child in relation map, closes #655	2019-10-09 23:04:01 +02:00
zadam	f6fc24d11d	use GFM extensions for markdown export, closes #638	2019-09-30 20:56:32 +02:00
zadam	42cf02e9a4	library updates	2019-09-30 19:35:00 +02:00
zadam	649862b01c	fixed mobile layout	2019-09-09 21:31:50 +02:00
zadam	76f3e87790	small fixes	2019-09-09 20:29:07 +02:00
zadam	faae11f070	template attributes don't need isInheritable flag to take effect	2019-09-07 11:00:15 +02:00
zadam	a17b8a053e	refactoring of note loading	2019-09-04 22:13:22 +02:00
zadam	55356963dd	improvements to similar notes - now using dice's coefficient for better results	2019-09-01 11:33:45 +02:00
zadam	4be7ac7ae1	export fixing links WIP	2019-08-31 10:12:42 +02:00
zadam	de95b92f90	link map tweaks	2019-08-30 20:15:59 +02:00
zadam	84b1f1f24e	text editor now support font size, color, background	2019-08-29 22:20:08 +02:00
zadam	650d9e0b27	state management fixes	2019-08-28 20:29:10 +02:00
zadam	48a654630f	added checkboxes/todo lists and image resize, closes #264, #587	2019-08-27 19:50:57 +02:00
zadam	0558c30b56	updated to ckeditor 12.4.0	2019-08-26 20:34:50 +02:00
zadam	9622b046e0	refactored options_init to options on frontend	2019-08-25 17:36:13 +02:00
zadam	fab4c59f9b	using dynamic import for dialogs and widgets to speed up initial load	2019-08-20 21:40:47 +02:00
zadam	f259c60b54	state is now applied to sidebar widgets	2019-08-16 21:29:44 +02:00
zadam	59da25ef55	sidebar & widget state management WIP	2019-08-15 10:04:03 +02:00
zadam	90f1bfb3e4	electron 6.0.2	2019-08-13 21:48:45 +02:00
zadam	dfa1ab65c6	allow requiring native node modules from backend scripts	2019-08-12 20:41:38 +02:00
zadam	7060700225	fix mobile tree not expanding automatically on load	2019-07-30 21:18:43 +02:00
zadam	b3834324f6	fix sync proxy with TLS	2019-07-24 20:47:41 +02:00
zadam	ea0835561c	option to use node's http client for sync without proxy	2019-07-22 22:46:06 +02:00
zadam	63b655cff4	package updates	2019-07-18 20:20:38 +02:00
zadam	b5d75f183a	update to ckeditor 12.3.1	2019-07-11 22:30:40 +02:00
zadam	706fc647ff	Merge branch 'stable' ... # Conflicts: # package.json	2019-07-11 22:27:27 +02:00
zadam	b9373806cf	fix doubling of extension	2019-07-11 20:40:40 +02:00
zadam	3413c9ed64	backport notePath handling fixes from master	2019-07-10 20:35:01 +02:00
zadam	3d7a5f20e7	make it again possible to open notes through URL hash	2019-07-09 22:12:05 +02:00
zadam	a912b2f23d	choose port dynamically from range based on environment	2019-07-07 10:49:34 +02:00
zadam	976684a3a8	save note in clipper	2019-07-06 16:48:06 +02:00
zadam	7b1fdfabf8	upgrade ckeditor to 12.3.0	2019-07-04 19:53:10 +02:00
zadam	070e8d9647	Merge branch 'stable'	2019-07-03 20:51:34 +02:00
zadam	e5036318af	fix enter on title to the code editor	2019-07-03 20:29:55 +02:00
zadam	427a266c57	Merge branch 'stable'	2019-07-02 21:56:23 +02:00
zadam	d18a20cc06	fix focus issue from title to the text content with tab/enter	2019-07-02 20:28:57 +02:00
zadam	ed380e09c9	context menu WIP	2019-06-30 18:56:46 +02:00
zadam	cf3726289c	attempt to fix the duplicate issue	2019-06-27 21:24:25 +02:00
zadam	7c77ae758b	fix frontend reload again	2019-06-26 20:49:17 +02:00
zadam	d49cae9cea	fix update of window title during note renaming	2019-06-24 20:12:04 +02:00
zadam	989da8877b	added link map	2019-06-20 10:20:44 +02:00
zadam	fead3cd7ad	fix note export/import/branch prefix to use right-clicked note as opposed to current active	2019-06-20 09:37:18 +02:00
zadam	5372f71faa	hide menu bar	2019-06-19 20:45:19 +02:00
zadam	288b3077b2	context menu items are now disabled when there are selected notes and the item does not support actions on multiple items	2019-06-16 12:06:06 +02:00
zadam	44f592c6cb	fix reload	2019-06-16 09:15:37 +02:00
zadam	f1967fd466	fix unhoisting note	2019-06-13 22:45:55 +02:00
zadam	ce2404b18a	add link to link map to README	2019-06-12 22:10:05 +02:00
zadam	c8049f0efe	small fixes	2019-06-12 19:59:52 +02:00
zadam	41cdd5c640	npm updates	2019-06-10 23:00:50 +02:00
zadam	68f67ec6ee	package upgrades	2019-05-31 18:39:18 +02:00
zadam	f08bf0be15	upgrade to electron 6.0.0-beta.4	2019-05-23 19:59:23 +02:00
zadam	ff5ea8b311	style change to active tab	2019-05-21 19:54:57 +02:00
zadam	f3e7e6bbe7	fix render note attributes	2019-05-19 10:30:00 +02:00
zadam	8c46e96397	tab styling tweaks	2019-05-19 08:47:00 +02:00
zadam	89d4be504d	tree active note now follows switched tabs (without changing scroll position)	2019-05-09 21:30:08 +02:00
zadam	7f0c92c56b	attributes and children overview working again	2019-05-04 22:44:25 +02:00
zadam	c7b5784123	context menu refactoring	2019-05-03 20:27:38 +02:00
zadam	8205cdc288	fix creation of top level note, closes #501	2019-04-29 21:18:12 +02:00
zadam	91e3eb8ae7	create "series" docker tag	2019-04-23 20:20:42 +02:00
zadam	2573c3b8a6	sync frontend dayjs to 1.8.12	2019-04-22 14:15:30 +02:00
zadam	25fe78012f	upgrade to ckeditor 12.1.0 which fixes some upload issues	2019-04-15 21:08:31 +02:00
zadam	fe3a0bc756	new find-in-page dialog (using electron-find) which actually works	2019-04-02 21:44:56 +02:00
zadam	9ca4a016eb	fix linux server build	2019-04-01 23:11:06 +02:00
zadam	925dc258a6	fix menu text color in dark themes	2019-04-01 21:38:21 +02:00
zadam	75dbaa4b77	fix csrf protection on electron build	2019-03-31 12:49:42 +02:00
zadam	67553cb40e	fix ordering of note migrations	2019-03-30 22:20:18 +01:00
zadam	07e9013152	content migration fixes	2019-03-27 21:04:25 +01:00
zadam	9fc5d328b4	added CSRF protection using csurf express middleware, fixes #455	2019-03-24 22:41:53 +01:00
zadam	251fcaeb48	support for superscript and subscript, closes #462	2019-03-24 19:58:13 +01:00
zadam	616829464f	refactoring of context menu items, got rid of ContextMenuItemsContainer	2019-03-19 22:56:37 +01:00
zadam	0d0464549f	notes are now created with correct local dates	2019-03-13 22:43:59 +01:00
zadam	b68b0fe783	Merge branch 'master' into dev31	2019-03-13 21:53:41 +01:00
zadam	b4c6d9f800	using now session cookies to store protectedSessionId	2019-03-13 21:53:09 +01:00
zadam	d25a1e3ed9	initial work on note fulltext (schema changes, updating...)	2019-03-10 17:02:23 +01:00
zadam	05374becfd	Merge branch 'master' into dev31	2019-03-10 10:11:01 +01:00
zadam	a432ad7483	fix isProtected consistency for images and files + related consistency check	2019-03-08 22:25:12 +01:00
zadam	cd6d4fb527	Merge pull request #420 from jkurei/master ... Querying by dateCreated and dateModified virtual attributes	2019-03-05 19:47:17 +01:00
zadam	16790e388b	recent changes should show titles of protected notes correctly when in protected session	2019-03-04 20:44:20 +01:00
zadam	95d8f07458	debugging info for image shrinking	2019-03-03 20:41:03 +01:00
zadam	bd118027fb	note content is also part of hash check	2019-03-02 12:40:46 +01:00
zadam	51bbc10744	switchable image shrinking	2019-02-24 12:24:28 +01:00
jkurei	ec384fafce	Querying by dateCreated and dateModified virtual attributes	2019-02-24 01:34:23 +01:00
zadam	cf5ec44303	another fix for debian package upload	2019-02-20 23:22:04 +01:00
zadam	604f036a54	fix debian package upload	2019-02-20 22:10:19 +01:00
zadam	16f16cb36a	fixed API for Trilium Sender, closes #415	2019-02-19 21:24:35 +01:00
zadam	899f24cde5	minor node upgrades	2019-02-17 22:56:33 +01:00
zadam	47b0e4e4d3	Save electron window size and position, closes #186	2019-02-12 22:42:40 +01:00
zadam	42112b8053	fix consistency check	2019-02-03 16:22:45 +01:00
zadam	d3ca6b5ae6	styling for scrollbar which looks ugly otherwise in dark themes	2019-02-03 10:21:28 +01:00
zadam	73247e3220	minor library updates	2019-02-02 19:21:30 +01:00
azivner	e211dd65ad	exit on detection of not supported node version, #324	2019-01-26 19:59:51 +01:00
azivner	3c19a712c0	active protected state button has darker background and is disabled	2019-01-11 23:29:56 +01:00
azivner	a103886ea5	responsive setup page	2019-01-05 21:49:40 +01:00
azivner	5d74dcd256	package-lock	2019-01-04 23:33:30 +01:00
azivner	c85979b66b	it should not be possible to add note after hoisted note	2019-01-02 18:59:08 +01:00
azivner	6704b755d8	attribute overview shows only owned attributes	2019-01-01 15:29:58 +01:00
azivner	d0d24f0f4a	unify ejs indentation to 4 spaces	2018-12-23 10:57:40 +01:00
azivner	e9a77f3f16	image sync fixes and 4.0.0 electron	2018-12-22 09:54:09 +01:00
azivner	321d0e8d64	explicit error handler for connection errors	2018-12-19 21:29:35 +01:00
azivner	84e1512031	added robots.txt to public root	2018-12-19 20:56:10 +01:00
azivner	8ca943f87b	fix hoistedNoteId option init	2018-12-18 20:34:24 +01:00
azivner	4ca7886090	uniform requests through electron's net and node http/https to support different proxy setups	2018-12-16 23:30:53 +01:00
azivner	b774d56cf7	note titles in jump to note start from hoisted note instead of root	2018-12-13 21:18:35 +01:00
azivner	8171b68b18	electron 4.0 beta 9, context menu padding	2018-12-11 19:50:31 +01:00
azivner	dd6a29dfc0	no ia32 release upload	2018-12-09 21:34:08 +01:00
azivner	c87b592277	fix in the release script	2018-12-02 08:42:11 +01:00
azivner	9da11ac144	electron 4 beta 8	2018-11-30 17:50:38 +01:00
Gabe Cook	5ea62c710d	Move devtron to devDependencies and update package-lock.json	2018-11-30 05:46:55 +00:00
azivner	e910595545	updated readme	2018-11-27 19:18:24 +01:00
azivner	e09b61d1ac	single file export working, tar WIP	2018-11-24 20:58:38 +01:00
azivner	3a06493459	partial workaround for the broken in page search (next & previous don't work, but at least highlighting works)	2018-11-21 23:39:19 +01:00
azivner	16a1dc12df	jsdoc now doesn't include date into files to avoid unnecessary noise	2018-11-19 21:03:43 +01:00
azivner	00ce379962	excludeFromExport support also in OPML	2018-11-19 09:34:05 +01:00
azivner	1ee8d9fd93	sql console executes selected text if there's a selection instead of the whole content	2018-11-18 08:29:56 +01:00
azivner	d19fa89f69	fixed sqlite3 windows binary	2018-11-16 21:44:50 +01:00
azivner	7b3c0243f3	enter protected password is not modal now, closes #217	2018-11-08 23:48:49 +01:00
azivner	a2434f200e	icon for relation map	2018-10-30 20:26:31 +01:00
azivner	04af8a3a96	fixed CTRL-ALT-P shortcut	2018-10-15 23:45:37 +02:00
azivner	209551a205	using new scrypt api from node 10 as a replacement of third party library	2018-10-14 11:48:29 +02:00
azivner	76c980b51f	electron 4.0.0-beta.3	2018-10-14 11:31:23 +02:00
azivner	949456212a	fix for ckeditor stretching body	2018-10-12 13:40:06 +02:00
azivner	06a867773e	minor library updates	2018-10-12 12:37:03 +02:00
azivner	b2776954a1	fix opening internal link from ckeditor link editing, fixes #191	2018-10-06 23:11:42 +02:00
azivner	62de7f28eb	consistently use root/ prefix for note paths	2018-10-06 21:32:07 +02:00
azivner	b4a566df9e	electron 2.0.9 and other small library updates	2018-09-10 19:09:05 +02:00
azivner	a90c164bbe	fix server build	2018-09-09 12:08:56 +02:00
azivner	46f37f7426	using @mlink/scrypt for node 10 compatibility	2018-09-05 15:14:20 +02:00
azivner	bc669c7b81	markdown wiki reference on README	2018-09-03 21:06:24 +02:00
azivner	467ad79129	implemented markdown export, #166	2018-09-02 23:39:10 +02:00
azivner	8adc111b0a	removed scripts which are outdated, demo document should be sufficient for now	2018-09-01 14:10:36 +02:00
azivner	bc38172792	readme update	2018-09-01 11:04:31 +02:00
azivner	be22d3cb4c	new server package build without using pkg (fixes images stuff)	2018-08-30 21:57:14 +02:00
azivner	b009bcb6a0	set originEntity to render note	2018-08-28 23:08:56 +02:00
azivner	ad123cfc1a	build fixes	2018-08-27 21:07:31 +02:00
azivner	b868990fba	using exact versions of packages from now on	2018-08-23 23:42:47 +02:00
azivner	406d74c4d7	initial focus on attribute type instead of name	2018-08-18 14:49:25 +02:00
azivner	daf96fcbf2	using zeit/pkg to package easy to use linux server edition	2018-07-06 00:05:06 +02:00
azivner	2bca94529e	minor upgrades	2018-07-05 23:17:53 +02:00
azivner	b2c9a0da21	fix note sources, fixes #123	2018-07-04 20:37:23 +02:00
azivner	be51e533fc	OPML import support (issue #78)	2018-05-29 20:32:13 -04:00
azivner	a931ce25fa	attempt to fix the hoek security warning with package upgrade	2018-05-21 16:08:34 -04:00
azivner	b507abb4f7	electron upgrade to 2.0.0	2018-05-08 16:39:01 -04:00
azivner	abfc64af95	script to generate large documents, closes #55	2018-04-03 22:15:28 -04:00
azivner	e8a5d0ae16	converted note revision protection to repository/entities	2018-03-31 10:51:37 -04:00
azivner	0ec909fd7a	added basic CLS support with re-entrant transactions	2018-03-28 23:41:22 -04:00
azivner	ac978c3fa7	upgrade to electron 2.0.0-beta.5, fixes #65	2018-03-23 21:01:49 -04:00
azivner	1501fa8dbf	import notes from tar archive, closes #63	2018-02-26 00:07:43 -05:00
azivner	aa2bbc6575	attachment download now works also in electron, added option to open the attachment	2018-02-18 22:19:07 -05:00
azivner	30c712a6be	updated package-lock	2018-02-15 23:07:58 -05:00
azivner	af34b378e2	electron dev dependencies upgrade	2018-01-24 22:30:31 -05:00
azivner	e9c2c4f895	electron 1.8.2-beta.4 upgrade	2018-01-24 22:20:03 -05:00
azivner	8fe6a9353a	added dialog and read only view of attributes	2018-01-11 00:01:16 -05:00
azivner	488e657cc4	forgotten express-promise-wrap in package.json	2018-01-07 10:04:43 -05:00
azivner	97c1b3061f	correct detection of optimized image format	2018-01-07 08:24:04 -05:00
azivner	784cd62df1	image sync	2018-01-06 15:56:00 -05:00
azivner	d9f29cbf27	resizing and optimizing jpeg images with mozjpeg	2018-01-06 12:38:25 -05:00
azivner	663bd1a8fe	added sync mutex for consistency checks and backup	2018-01-04 21:37:36 -05:00
azivner	c24d9a0afa	added search for electron + sourcemap for jquery	2017-12-12 21:40:55 -05:00
azivner	f55f0a4ed3	make sure entity IDs are generated only with alphanumeric characters (base62)	2017-12-09 20:44:06 -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	41f089b3f4	pretty printing HTML output (for nice git diffs)	2017-12-03 09:19:48 -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	160c1c455c	initial implementation of tree prefix	2017-11-26 22:34:25 -05:00