1278 Commits

Author SHA1 Message Date
zadam
262a4fa3c7 removed image minification using imagemin because of constant platform related issues 2020-06-28 22:36:42 +02:00
zadam
c778e87683 wip 2020-06-27 00:40:35 +02:00
zadam
9615e25a67 fix merge problems 2020-06-24 22:29:53 +02:00
zadam
a574fce13f Merge remote-tracking branch 'origin/stable' into syncification
# Conflicts:
#	package-lock.json
#	package.json
#	src/routes/custom.js
#	src/services/import/single.js
2020-06-24 22:08:31 +02:00
zadam
238df0fb40 fix SVG single file import as image and not as file, closes #1114 2020-06-24 21:47:50 +02:00
zadam
c78ca4c9db fixed triggers to sort children of notes with "sorted" label, closes #1126 2020-06-23 22:03:01 +02:00
zadam
b245b249d3 got rid of simple-node-logger in favor of simple custom logger 2020-06-23 13:38:27 +02:00
zadam
a0395e9866 release 0.43.1 2020-06-23 10:11:17 +02:00
zadam
89aa4fbc73 electron 9.0.5 2020-06-23 10:10:59 +02:00
zadam
22302e8200 attrs WIP 2020-06-21 23:41:51 +02:00
zadam
f117ae4915 fix sending sync rows via WebSocket after transaction is committed 2020-06-21 13:44:47 +02:00
zadam
c34a9b96e4 further simplification - now using better-sqlite3 native transaction API 2020-06-21 13:33:56 +02:00
zadam
f0acfaf147 simplification of transaction handling 2020-06-21 13:15:36 +02:00
zadam
56d6384ae1 added protected note full text search 2020-06-20 23:46:49 +02:00
zadam
5f699cc28c converted most dynamic SQL queries into prepared statement to avoid excessive statement caching 2020-06-20 23:24:34 +02:00
zadam
969f31dde2 fixed backup and anonymization with better-sqlite3 2020-06-20 23:09:34 +02:00
zadam
027afab6b1 fix DB setup 2020-06-20 21:42:41 +02:00
zadam
6207203b35 wip 2020-06-20 13:18:03 +02:00
zadam
88348c560c syncification 2020-06-20 12:31:38 +02:00
zadam
30062d687f Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
2020-06-20 09:40:11 +02:00
zadam
2af2b45062 fix keyboard shortcut for print this note, #1118 2020-06-20 00:04:31 +02:00
zadam
f700e6e12b use standard search to find notes with same attrs 2020-06-18 22:28:18 +02:00
zadam
a87e59cecb WIP of attribute view on click 2020-06-18 12:52:16 +02:00
zadam
a04aa6fd36 version updates 2020-06-18 09:12:30 +02:00
zadam
a7d9870846 Merge remote-tracking branch 'origin/better-sqlite3'
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/services/utils.js
#	src/public/app/widgets/type_widgets/editable_text.js
#	src/services/utils.js
2020-06-18 09:03:09 +02:00
zadam
f745e21e0d use better-sqlite3 2020-06-17 23:03:46 +02:00
zadam
5f2361ebd5 release 0.43.0-beta 2020-06-15 23:26:12 +02:00
zadam
85d986534d fix enforcing node's http requests for sync 2020-06-15 18:24:43 +02:00
zadam
00faf758e8 fixes and polish 2020-06-15 17:56:53 +02:00
zadam
6ba2e5cf73 add word count widget to the demo document (plus cleanup of external links) 2020-06-14 16:29:29 +02:00
zadam
fb975849b9 small API additions 2020-06-14 14:30:57 +02:00
zadam
e0b4b369dc transaction handling fixes 2020-06-14 00:35:53 +02:00
zadam
0df7851214 fix sync 2020-06-13 22:34:15 +02:00
zadam
5d47c2b23e opening transactions only on write operations which enforces exclusive lock only there to improve concurrency, custom handling of sync request timeouts, #1093, #1018 2020-06-13 10:23:36 +02:00
zadam
2d92b4931a fix ctrl+click opening the link twice/thrice, closes #1094 2020-06-10 00:10:27 +02:00
zadam
535dcb6d12 release 0.42.7 2020-06-08 10:43:12 +02:00
zadam
e70c862e72 fix import 2020-06-07 23:55:55 +02:00
zadam
e8cd821e57 futrther improvements to anonymization 2020-06-07 10:20:48 +02:00
zadam
be7ac74235 better fallback for resolving filenames of binary attachments 2020-06-05 10:40:35 +02:00
zadam
e817acba4e fix template attribute cycle in note cache 2020-06-04 23:58:31 +02:00
zadam
4ae965c5cb Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	src/public/app/widgets/collapsible_widgets/note_info.js
2020-06-04 22:37:04 +02:00
zadam
1502b9ce66 prevent attribute inheritance cycle via template, closes #1077 2020-06-04 12:27:41 +02:00
zadam
ed9fbae65d attribute parser and tests WIP 2020-06-04 00:04:57 +02:00
zadam
915b1d1a45 Merge remote-tracking branch 'origin/stable'
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/widgets/type_widgets/editable_text.js
2020-06-03 16:25:45 +02:00
zadam
e68aed2057 Merge remote-tracking branch 'origin/master' 2020-06-03 16:24:52 +02:00
zadam
eedeaca37d wip 2020-06-03 16:24:41 +02:00
zadam
7307ca385f release 0.42.6 2020-06-03 14:30:07 +02:00
zadam
c1fd9825aa fix backup 2020-06-03 12:16:16 +02:00
zadam
3c5db844ba fix tree focusing issues 2020-06-03 11:06:45 +02:00
zadam
e7330c1104 more anonymization 2020-06-03 09:55:05 +02:00