Merge branch 'master' into Produktmanagement
# Conflicts: # process/Keyword_lib/process.js
No related branches found
No related tags found
Showing
- entity/Address_entity/entityfields/is_standard/possibleItemsProcess.js 6 additions, 6 deletions...s_entity/entityfields/is_standard/possibleItemsProcess.js
- entity/Comm_entity/Comm_entity.aod 31 additions, 1 deletionentity/Comm_entity/Comm_entity.aod
- entity/Comm_entity/conditionProcess.js 27 additions, 8 deletionsentity/Comm_entity/conditionProcess.js
- entity/Comm_entity/entityfields/commid/valueProcess.js 2 additions, 0 deletionsentity/Comm_entity/entityfields/commid/valueProcess.js
- entity/Comm_entity/entityfields/is_standard/valueProcess.js 5 additions, 3 deletionsentity/Comm_entity/entityfields/is_standard/valueProcess.js
- entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js 20 additions, 8 deletions...omm_entity/entityfields/medium_id/possibleItemsProcess.js
- entity/Comm_entity/entityfields/medium_id/valueMappingProcess.js 8 additions, 0 deletions...Comm_entity/entityfields/medium_id/valueMappingProcess.js
- entity/Pers_entity/Pers_entity.aod 60 additions, 0 deletionsentity/Pers_entity/Pers_entity.aod
- entity/Pers_entity/entityfields/perscommemail_dfo/children/mediumcategoriesfilter_param/code.js 4 additions, 0 deletions...mmemail_dfo/children/mediumcategoriesfilter_param/code.js
- entity/Pers_entity/entityfields/perscommemail_dfo/children/relid_param/code.js 4 additions, 0 deletions...tityfields/perscommemail_dfo/children/relid_param/code.js
- entity/Pers_entity/entityfields/perscommothers_dfo/children/mediumcategoriesfilter_param/code.js 4 additions, 0 deletions...mothers_dfo/children/mediumcategoriesfilter_param/code.js
- entity/Pers_entity/entityfields/perscommothers_dfo/children/relid_param/code.js 4 additions, 0 deletions...ityfields/perscommothers_dfo/children/relid_param/code.js
- entity/Pers_entity/entityfields/perscommphone_dfo/children/mediumcategoriesfilter_param/code.js 4 additions, 0 deletions...mmphone_dfo/children/mediumcategoriesfilter_param/code.js
- entity/Pers_entity/entityfields/perscommphone_dfo/children/relid_param/code.js 4 additions, 0 deletions...tityfields/perscommphone_dfo/children/relid_param/code.js
- language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod 311 additions, 305 deletionslanguage/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
- language/_____LANGUAGE_de/_____LANGUAGE_de.aod 387 additions, 377 deletionslanguage/_____LANGUAGE_de/_____LANGUAGE_de.aod
- language/_____LANGUAGE_en/_____LANGUAGE_en.aod 307 additions, 301 deletionslanguage/_____LANGUAGE_en/_____LANGUAGE_en.aod
- neonView/PersPreview_view/PersPreview_view.aod 72 additions, 62 deletionsneonView/PersPreview_view/PersPreview_view.aod
- process/Keyword_lib/process.js 19 additions, 4 deletionsprocess/Keyword_lib/process.js
- process/Sql_lib/process.js 1065 additions, 1005 deletionsprocess/Sql_lib/process.js
This diff is collapsed.
Please register or sign in to comment