zadam 9e9fb2979f Merge branch 'master' into next61 ...

# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/components/note_context.js
#	src/public/app/services/open.js
#	src/public/app/widgets/buttons/note_actions.js
#	src/public/app/widgets/find_in_code.js
#	src/public/app/widgets/type_widgets/canvas.js
#	src/services/options.js

2023-05-20 20:55:57 +02:00

..

codeStyles

electron update

2020-11-10 22:54:03 +01:00

inspectionProfiles

eslint config

2023-04-09 23:08:24 +02:00

jsLinters

eslint config

2023-04-09 23:08:24 +02:00

.gitignore

more robust handling of sync error, fixes #830

2020-01-18 08:48:36 +01:00

dataSources.xml

blob WIP

2023-03-16 13:29:11 +01:00

encodings.xml

relation map WIP

2018-10-25 12:06:36 +02:00

git_toolbox_prj.xml

refactoring

2023-02-13 16:22:34 +01:00

jsLibraryMappings.xml

idea config stuff

2021-04-13 21:54:34 +02:00

misc.xml

launchbar WIP

2022-08-04 23:00:32 +02:00

modules.xml

removed some warnings in idea

2018-03-24 12:52:58 -04:00

sqldialects.xml

idea config stuff

2021-04-13 21:54:34 +02:00

vcs.xml

use official gh client instead of github-release to execute releases

2021-04-18 21:29:10 +02:00