Tom 8d510a3fdd Merge remote-tracking branch 'upstream/master' into excalidraw ...

conflict in
- package-lock (accept incoming),
- routes (remove the option to have image without filename, since it is not really necessary for canvas_note)
- note_detail

2022-05-03 21:56:52 +02:00

..

api

Merge remote-tracking branch 'upstream/master' into excalidraw

2022-05-03 21:56:52 +02:00

custom.js

backend import unification

2021-06-29 22:15:57 +02:00

electron.js

fixed "duplicate subtree"

2021-02-14 11:43:31 +01:00

index.js

add memberId to entity_changes to avoid having to resend all changes second time

2022-01-09 20:16:39 +01:00

login.js

ETAPI auth, spec improvements etc.

2022-01-10 17:09:20 +01:00

routes.js

make :filename for GETing an image optional

2022-04-19 00:17:39 +02:00

setup.js

etapi improvements and more tests

2022-01-12 19:32:23 +01:00