Merge branch 'master' into campaignmanagement
# Conflicts: # .liquibase/Data_alias/basic/2019.2/changelog.xml # aliasDefinition/Data_alias/Data_alias.aod # entity/KeywordEntry_entity/KeywordEntry_entity.aod # language/_____LANGUAGE_de/_____LANGUAGE_de.aod # preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
Showing
- .liquibase/Data_alias/basic/2019.2/change_Milestone_datatype_to_new_Keyword_logic_Derby.xml 16 additions, 0 deletions.../change_Milestone_datatype_to_new_Keyword_logic_Derby.xml
- .liquibase/Data_alias/basic/2019.2/change_Milestone_datatype_to_new_Keyword_logic_notDerby.xml 7 additions, 0 deletions...ange_Milestone_datatype_to_new_Keyword_logic_notDerby.xml
- .liquibase/Data_alias/basic/2019.2/changelog.xml 8 additions, 2 deletions.liquibase/Data_alias/basic/2019.2/changelog.xml
- .liquibase/Data_alias/basic/2019.2/renameCycle_to_Milestone.xml 9 additions, 0 deletions...base/Data_alias/basic/2019.2/renameCycle_to_Milestone.xml
- .liquibase/Data_alias/basic/2019.2/update_Milestone_to_new_Keyword.xml 135 additions, 0 deletions...ta_alias/basic/2019.2/update_Milestone_to_new_Keyword.xml
- aliasDefinition/Data_alias/Data_alias.aod 104 additions, 103 deletionsaliasDefinition/Data_alias/Data_alias.aod
- entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js 0 additions, 1 deletion...yfields/newmodule/children/newcontract/onActionProcess.js
- entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js 0 additions, 1 deletion...tityfields/newmodule/children/newcontract/stateProcess.js
- entity/360Degree_entity/recordcontainers/jdito/contentProcess.js 0 additions, 2 deletions...360Degree_entity/recordcontainers/jdito/contentProcess.js
- entity/Activity_entity/Activity_entity.aod 1 addition, 0 deletionsentity/Activity_entity/Activity_entity.aod
- entity/Address_entity/recordcontainers/db/onDBInsert.js 0 additions, 1 deletionentity/Address_entity/recordcontainers/db/onDBInsert.js
- entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js 0 additions, 1 deletion...tLink_entity/entityfields/objectid/displayValueProcess.js
- entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js 8 additions, 10 deletions...ink_entity/entityfields/objecttype/displayValueProcess.js
- entity/Attribute_entity/Attribute_entity.aod 4 additions, 0 deletionsentity/Attribute_entity/Attribute_entity.aod
- entity/Attribute_entity/entityfields/name_with_type/valueProcess.js 8 additions, 11 deletions...ribute_entity/entityfields/name_with_type/valueProcess.js
- entity/Communication_entity/recordcontainers/db/onDBUpdate.js 0 additions, 1 deletion...ty/Communication_entity/recordcontainers/db/onDBUpdate.js
- entity/Contact_entity/entityfields/address_id/valueProcess.js 0 additions, 1 deletion...ty/Contact_entity/entityfields/address_id/valueProcess.js
- entity/Context_entity/Context_entity.aod 0 additions, 6 deletionsentity/Context_entity/Context_entity.aod
- entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js 1 addition, 1 deletion...ityfields/contractcode_display_fieldgroup/valueProcess.js
- entity/Contract_entity/entityfields/image/valueProcess.js 1 addition, 3 deletionsentity/Contract_entity/entityfields/image/valueProcess.js
Loading
Please register or sign in to comment