Merge origin/master into object-relation (3dd204b1) · Commits · xrm / basic · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

basic
- Activity
- Members
- Releases
- Model registry
- Contributor analytics
- Model experiments

Snippets Groups Projects

3dd204b1

Commit 3dd204b1 authored 6 years ago by Johannes Hörmann

Downloads
- Patches
- Plain Diff

Merge origin/master into object-relation

Conflicts:
	entity/Contract_entity/Contract_entity.aod

parent a4f7f8ea

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

entity/ObjectRelation_entity/ObjectRelation_entity.aod 35 additions, 0 deletions

entity/ObjectRelation_entity/ObjectRelation_entity.aod
entity/ObjectRelation_entity/entityfields/object1_type/linkedContextProcess.js 0 additions, 0 deletions

..._entity/entityfields/object1_type/linkedContextProcess.js
entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/code.js 6 additions, 0 deletions

...y/entityfields/objects1/children/objecttype_param/code.js
entity/ObjectRelation_entity/entityfields/objects2/children/objecttype_param/code.js 0 additions, 0 deletions

...y/entityfields/objects2/children/objecttype_param/code.js
entity/Object_entity/recordcontainers/jdito/contentProcess.js 13 additions, 2 deletions

...ty/Object_entity/recordcontainers/jdito/contentProcess.js
neonContext/Object_context/Object_context.aod 7 additions, 0 deletions

neonContext/Object_context/Object_context.aod
neonView/ContactMain_view/ContactMain_view.aod 4 additions, 4 deletions

neonView/ContactMain_view/ContactMain_view.aod
neonView/ObjectLookup_view/ObjectLookup_view.aod 22 additions, 0 deletions

neonView/ObjectLookup_view/ObjectLookup_view.aod
process/Context_lib/process.js 10 additions, 5 deletions

process/Context_lib/process.js

with 97 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment