Revert "Merge branch '#1035025_SALUTATION' into 'master'" (7491acdf) · Commits · xrm / ADITO_Update_Upgrade

Commit 7491acdf authored 6 years ago by Johannes Hörmann

Revert "Merge branch '#1035025_SALUTATION' into 'master'"

This reverts merge request !14

parent 34e25c49

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.merge_file_a67688 0 additions, 279 deletions

.merge_file_a67688
aliasDefinition/Data_alias/Data_alias.aod 0 additions, 132 deletions

aliasDefinition/Data_alias/Data_alias.aod
application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod 0 additions, 1 deletion

..._SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod 14 additions, 13 deletions

...___SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod 14 additions, 14 deletions

...TEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js 5 additions, 0 deletions

...intmentlinks/children/appointmentid_param/valueProcess.js
entity/AttributeRelation_entity/AttributeRelation_entity.aod 6 additions, 0 deletions

entity/AttributeRelation_entity/AttributeRelation_entity.aod
entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js 5 additions, 5 deletions

...tion_entity/entityfields/valueproxy/contentTypeProcess.js
entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js 9 additions, 9 deletions

...eRelation_entity/entityfields/valueproxy/onValueChange.js
entity/Person_entity/Person_entity.aod 7 additions, 63 deletions

entity/Person_entity/Person_entity.aod
entity/Person_entity/entityfields/gender/displayValueProcess.js 0 additions, 20 deletions

.../Person_entity/entityfields/gender/displayValueProcess.js
entity/Person_entity/entityfields/gender/valueProcess.js 0 additions, 11 deletions

entity/Person_entity/entityfields/gender/valueProcess.js
entity/Person_entity/entityfields/language/onValueChange.js 0 additions, 11 deletions

entity/Person_entity/entityfields/language/onValueChange.js
entity/Person_entity/entityfields/language/valueProcess.js 0 additions, 7 deletions

entity/Person_entity/entityfields/language/valueProcess.js
entity/Person_entity/entityfields/organisations/children/withprivat_param/valueProcess.js 2 additions, 1 deletion

...s/organisations/children/withprivat_param/valueProcess.js
entity/Person_entity/entityfields/salutation/displayValueProcess.js 0 additions, 9 deletions

...son_entity/entityfields/salutation/displayValueProcess.js
entity/Person_entity/entityfields/salutation/possibleItemsProcess.js 3 additions, 0 deletions

...on_entity/entityfields/salutation/possibleItemsProcess.js
entity/Person_entity/entityfields/salutations/children/language_param/valueProcess.js 0 additions, 4 deletions

...ields/salutations/children/language_param/valueProcess.js
entity/Person_entity/entityfields/salutationtitles/children/language_param/valueProcess.js 0 additions, 4 deletions

.../salutationtitles/children/language_param/valueProcess.js
entity/Person_entity/entityfields/title/displayValueProcess.js 0 additions, 9 deletions

...y/Person_entity/entityfields/title/displayValueProcess.js

with 65 additions and 592 deletions

Please register or to comment