Commit 3822e202 authored 4 years ago by Johannes Goderbauer

Merge branch '2020.1'

# Conflicts:
#	entity/Appointment_entity/entityfields/begin/valueProcess.js
#	entity/Appointment_entity/entityfields/end/valueProcess.js

parents 44e65555 4f9a08ea

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.liquibase/Data_alias/basic/2020.1.0/ExportTemplate/create_ExportTemplateTables.xml 2 additions, 2 deletions

...c/2020.1.0/ExportTemplate/create_ExportTemplateTables.xml
.liquibase/Data_alias/basic/2020.1.0/changelog.xml 1 addition, 0 deletions

.liquibase/Data_alias/basic/2020.1.0/changelog.xml
.liquibase/Data_alias/basic/2020.1.0/update_Salutation_headline.xml 38 additions, 0 deletions

.../Data_alias/basic/2020.1.0/update_Salutation_headline.xml
.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml 5 additions, 5 deletions

...ase/Data_alias/basic/_demoData/generatedData/activity.xml
.liquibase/Data_alias/basic/_demoData/generatedData/address.xml 42 additions, 41 deletions

...base/Data_alias/basic/_demoData/generatedData/address.xml
.liquibase/Data_alias/basic/_demoData/generatedData/salutation.xml 8 additions, 8 deletions

...e/Data_alias/basic/_demoData/generatedData/salutation.xml
.liquibase/_____SYSTEMALIAS/basic/2020.0.2/changelog.xml 0 additions, 7 deletions

.liquibase/_____SYSTEMALIAS/basic/2020.0.2/changelog.xml
.liquibase/_____SYSTEMALIAS/basic/Workflow/webserviceUser_flowableIdmService.xml 86 additions, 0 deletions

...LIAS/basic/Workflow/webserviceUser_flowableIdmService.xml
.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/72f0f500-e7b7-4b0d-90e3-240d9edc88ee 162 additions, 119 deletions

...ES/BINDATA/blobFiles/72f0f500-e7b7-4b0d-90e3-240d9edc88ee
.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml 1 addition, 3 deletions

...MALIAS/basic/init/data/defaultBlob/_____configuration.xml
.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml 1 addition, 1 deletion

...basic/init/data/defaultBlob/_____system_sysdb_version.xml
.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml 1 addition, 1 deletion

...___SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/defaultDbRepository.xml 1 addition, 1 deletion

...ALIAS/basic/init/data/defaultBlob/defaultDbRepository.xml
.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/mailServerIMAP.xml 1 addition, 1 deletion

...YSTEMALIAS/basic/init/data/defaultBlob/mailServerIMAP.xml
.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_permissionaction.xml 1 addition, 1 deletion

...TEMALIAS/basic/init/data/insert_asys_permissionaction.xml
.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml 2 additions, 2 deletions

...e/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
.liquibase/_____SYSTEMALIAS/changelog.xml 2 additions, 0 deletions

.liquibase/_____SYSTEMALIAS/changelog.xml
aliasDefinition/Data_alias/Data_alias.aod 24 additions, 4 deletions

aliasDefinition/Data_alias/Data_alias.aod
aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/isolanguage/customproperties/translate4log/property.js 7 additions, 0 deletions

...ds/isolanguage/customproperties/translate4log/property.js
aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/object_rowid/customproperties/translate4log/property.js 3 additions, 4 deletions

...s/object_rowid/customproperties/translate4log/property.js

with 388 additions and 200 deletions

Please register or to comment