Merge branch '2020.0_projectUpgraded'
# Conflicts: # .aditoprj/project.version # .liquibase/Data_alias/changelog.xml # entity/Employee_entity/Employee_entity.aod # entity/KeywordEntry_entity/KeywordEntry_entity.aod # entity/SingleObject_entity/SingleObject_entity.aod # entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod # entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod # entity/WorkflowInstance_entity/recordcontainers/jdito/onInsert.js # entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod # language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod # language/_____LANGUAGE_de/_____LANGUAGE_de.aod # language/_____LANGUAGE_en/_____LANGUAGE_en.aod # preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod # process/KeywordRegistry_basic/process.js # process/SendEmail_workflowService/SendEmail_workflowService.aod # process/workflowServiceTaskParams_rest/process.js # process/workflowServiceTaskParams_rest/workflowServiceTaskParams_rest.aod
Showing
- .liquibase/Data_alias/basic/2019.3.0/update_assistance_attributes.xml 2 additions, 1 deletion...ata_alias/basic/2019.3.0/update_assistance_attributes.xml
- .liquibase/_____SYSTEMALIAS/basic/init/init.xml 1 addition, 0 deletions.liquibase/_____SYSTEMALIAS/basic/init/init.xml
- .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_usertoken.xml 23 additions, 0 deletions...__SYSTEMALIAS/basic/init/struct/create_asys_usertoken.xml
- aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod 164 additions, 0 deletionsaliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
- entity/360Degree_entity/recordcontainers/jdito/contentProcess.js 7 additions, 2 deletions...360Degree_entity/recordcontainers/jdito/contentProcess.js
- entity/Employee_entity/Employee_entity.aod 7 additions, 0 deletionsentity/Employee_entity/Employee_entity.aod
- entity/Employee_entity/recordcontainers/jdito/contentProcess.js 109 additions, 108 deletions.../Employee_entity/recordcontainers/jdito/contentProcess.js
- entity/Employee_entity/recordcontainers/jdito/onInsert.js 1 addition, 0 deletionsentity/Employee_entity/recordcontainers/jdito/onInsert.js
- entity/Employee_entity/recordcontainers/jdito/onUpdate.js 1 addition, 0 deletionsentity/Employee_entity/recordcontainers/jdito/onUpdate.js
- entity/Leadimport_entity/recordcontainers/db/onDBInsert.js 1 addition, 1 deletionentity/Leadimport_entity/recordcontainers/db/onDBInsert.js
- entity/Leadimport_entity/recordcontainers/db/onDBUpdate.js 1 addition, 1 deletionentity/Leadimport_entity/recordcontainers/db/onDBUpdate.js
- entity/Person_entity/Person_entity.aod 0 additions, 5 deletionsentity/Person_entity/Person_entity.aod
- entity/Person_entity/entityfields/language/onValueChange.js 18 additions, 3 deletionsentity/Person_entity/entityfields/language/onValueChange.js
- entity/Person_entity/entityfields/salutation/displayValueProcess.js 0 additions, 9 deletions...son_entity/entityfields/salutation/displayValueProcess.js
- entity/Person_entity/recordcontainers/db/recordfieldmappings/salutation.displayvalue/expression.js 0 additions, 3 deletions...recordfieldmappings/salutation.displayvalue/expression.js
- entity/Productprice_entity/Productprice_entity.aod 4 additions, 0 deletionsentity/Productprice_entity/Productprice_entity.aod
- entity/Productprice_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js 3 additions, 0 deletions...recordfieldmappings/product_id.displayvalue/expression.js
- entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js 5 additions, 2 deletions...cessor_entity/entityfields/drop_action/onActionProcess.js
- language/_____LANGUAGE_de/_____LANGUAGE_de.aod 5 additions, 0 deletionslanguage/_____LANGUAGE_de/_____LANGUAGE_de.aod
- neonView/ActivityFilter_view/ActivityFilter_view.aod 26 additions, 0 deletionsneonView/ActivityFilter_view/ActivityFilter_view.aod
Loading
Please register or sign in to comment