zadam
|
f4a4e746bf
|
Merge remote-tracking branch 'origin/stable'
# Conflicts:
# libraries/ckeditor/ckeditor.js.map
# package.json
# src/routes/api/login.js
# src/routes/api/sync.js
# src/routes/index.js
# src/services/app_info.js
# src/services/sync.js
|
2020-08-02 20:41:22 +02:00 |
|
zadam
|
95bbdb3b6b
|
CKEditor 21
|
2020-07-29 23:34:49 +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
|
89356918f1
|
fix unescaped HTML in the tree node title, closes #1127
|
2020-06-24 21:07:55 +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
|
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
|
d09b021487
|
add time limit to frontend update
|
2020-06-11 00:13:56 +02:00 |
|
zadam
|
6a957eff17
|
added autocompletes for labels, relations
|
2020-05-28 23:59:08 +02:00 |
|
zadam
|
99aa481ace
|
refactoring for testing parser
|
2020-05-20 00:03:33 +02:00 |
|
zadam
|
6161b1c193
|
Merge remote-tracking branch 'origin/stable'
|
2020-04-29 22:27:46 +02:00 |
|
zadam
|
86cf8f3202
|
fix download/export
|
2020-04-27 20:58:31 +02:00 |
|
zadam
|
586d6b4557
|
in web version use local client time instead of server time for recording dateModified etc.
|
2020-04-26 14:26:57 +02:00 |
|
zadam
|
988fae50cb
|
fix help links and displayed shortcuts, closes #971
|
2020-04-18 11:14:09 +02:00 |
|
zadam
|
29cec8112e
|
fix setup of new document, closes #966
|
2020-04-14 21:57:42 +02:00 |
|