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

..

codeStyles

options split into individual classes

2019-08-21 20:24:37 +02:00

dataSources

refactored layouts for extra window

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

inspectionProfiles

removed some warnings in idea

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

jsLinters

WIP refactoring of data structures in note tree

2018-03-24 20:41:27 -04:00

.gitignore

more robust handling of sync error, fixes #830

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

dataSources.xml

deps updates

2020-04-19 09:42:10 +02:00

encodings.xml

relation map WIP

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

jsLibraryMappings.xml

small refactorings

2019-10-20 13:09:00 +02:00

misc.xml

WIP refactoring of data structures in note tree

2018-03-24 20:41:27 -04:00

modules.xml

removed some warnings in idea

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

sqldialects.xml

attributes can be inherited through special relation "inheritAttributes"

2018-08-13 17:05:16 +02:00

vcs.xml

small text changes

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