Merge remote-tracking branch 'origin/master' into campaignmanagement
# Conflicts: # language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod # language/_____LANGUAGE_de/_____LANGUAGE_de.aod # language/_____LANGUAGE_en/_____LANGUAGE_en.aod
Showing
- .liquibase/Data_alias/basic/2019.2/Classification/create_classification_tables.xml 1 addition, 1 deletion...ic/2019.2/Classification/create_classification_tables.xml
- .liquibase/Data_alias/basic/2019.2/Classification/insert_classification_scores.xml 59 additions, 59 deletions...ic/2019.2/Classification/insert_classification_scores.xml
- aliasDefinition/Data_alias/Data_alias.aod 14 additions, 14 deletionsaliasDefinition/Data_alias/Data_alias.aod
- entity/Address_entity/Address_entity.aod 0 additions, 2 deletionsentity/Address_entity/Address_entity.aod
- entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod 1 addition, 6 deletions...ClassificationAdmin_entity/ClassificationAdmin_entity.aod
- entity/ClassificationAdmin_entity/contentTitleProcess.js 4 additions, 0 deletionsentity/ClassificationAdmin_entity/contentTitleProcess.js
- entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js 1 addition, 1 deletion...tionAdmin_entity/recordcontainers/jdito/contentProcess.js
- entity/ClassificationScore_entity/ClassificationScore_entity.aod 27 additions, 8 deletions...ClassificationScore_entity/ClassificationScore_entity.aod
- entity/ClassificationScore_entity/entityfields/classificationtype_id/displayValueProcess.js 7 additions, 0 deletions...entityfields/classificationtype_id/displayValueProcess.js
- entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js 1 addition, 1 deletion...entity/entityfields/classificationtype_id/valueProcess.js
- entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js 4 additions, 4 deletions...icationScore_entity/entityfields/maxvalue/valueProcess.js
- entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js 1 addition, 1 deletion...ationScore_entity/recordcontainers/db/conditionProcess.js
- entity/ClassificationScore_entity/recordcontainers/db/recordfieldmappings/classificationtype_id.displayvalue/expression.js 3 additions, 0 deletions...mappings/classificationtype_id.displayvalue/expression.js
- entity/Classification_entity/Classification_entity.aod 51 additions, 30 deletionsentity/Classification_entity/Classification_entity.aod
- entity/Classification_entity/entityfields/classificationgroup/dropDownProcess.js 10 additions, 2 deletions...ntity/entityfields/classificationgroup/dropDownProcess.js
- entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js 1 addition, 1 deletion...tity/entityfields/classificationgroup/mandatoryProcess.js
- entity/Classification_entity/entityfields/classificationgroup/onValidation.js 28 additions, 0 deletions...n_entity/entityfields/classificationgroup/onValidation.js
- entity/Classification_entity/entityfields/classificationgroup/titleProcess.js 13 additions, 0 deletions...n_entity/entityfields/classificationgroup/titleProcess.js
- entity/Classification_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js 4 additions, 0 deletions...nscores/children/classificationtype_param/valueProcess.js
- entity/Classification_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js 4 additions, 0 deletions...cores/children/classificationtypeid_param/valueProcess.js
Loading
Please register or sign in to comment