zadam aff12950f0 Merge remote-tracking branch 'origin/master' into m42 ...

# Conflicts:
#	src/public/app/services/app_context.js

2020-04-25 23:53:19 +02:00

..

api

small text changes

2020-04-24 21:21:22 +02:00

custom.js

uploading new file revisions

2019-11-09 11:58:52 +01:00

electron.js

new mechanism to wait for sync after interaction with backend in Script API using api.waitForMaxKnownSyncId()

2019-12-09 23:07:45 +01:00

index.js

refactored layouts for extra window

2020-04-25 23:52:13 +02:00

login.js

fix redirect after login

2019-05-22 21:25:13 +02:00

routes.js

recent changes respect hoisted note state

2020-03-29 19:37:34 +02:00

setup.js

create separate window for setup and then main window

2019-12-24 14:42:03 +01:00