zadam 4401a8e1e8 Merge branch 'master' into m41 ...

# Conflicts:
#	src/public/javascripts/dialogs/add_link.js
#	src/public/javascripts/dialogs/export.js
#	src/public/javascripts/dialogs/import.js
#	src/public/javascripts/dialogs/note_info.js
#	src/public/javascripts/services/search_notes.js

2020-02-09 18:54:56 +01:00

..

api

Merge branch 'master' into m41

2020-02-09 18:54:56 +01: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

added "include note" widget to text notes, WIP

2019-12-29 23:46:40 +01:00

login.js

fix redirect after login

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

routes.js

renamed notefull to notecomplement

2020-02-01 11:15:58 +01:00

setup.js

create separate window for setup and then main window

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