Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: ba8230382e1200a1b628f1a9161f15c8fab59301
https://github.com/Evolveum/midpoint/commit/ba8230382e1200a1b628f1a9161f15c8fab59301
Author: honchar <honchar at evolveum.com>
Date: 2017-03-16 (Thu, 16 Mar 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
M gui/admin-gui/src/main/webapp/less/midpoint-theme-variables.less
M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
Log Message:
-----------
role catalog: assignments multiplicity
Commit: e29c89164228fd0adffcb4761ef625389facd882
https://github.com/Evolveum/midpoint/commit/e29c89164228fd0adffcb4761ef625389facd882
Author: honchar <honchar at evolveum.com>
Date: 2017-03-16 (Thu, 16 Mar 2017)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPathSegment.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/NameItemPathSegment.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ItemPathType.java
M infra/prism/src/main/resources/xml/ns/public/query-3.xsd
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M model/certification-impl/pom.xml
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertReviewersHelper.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/CriticalRolesCertificationTest.java
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/RoleInducementCertificationTest.java
M model/certification-impl/src/test/resources/common/certification-of-critical-roles.xml
M model/certification-impl/src/test/resources/common/certification-of-eroot-user-assignments.xml
M model/certification-impl/src/test/resources/common/certification-of-role-inducements.xml
M model/certification-impl/src/test/resources/common/orgs-and-users.xml
M model/certification-impl/src/test/resources/common/role-ceo.xml
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ObjectDeltaObject.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
M model/model-impl/src/test/resources/common/user-template.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractObjTemplateSyncTest.java
M model/model-intest/src/test/resources/sync/user-template-byzantine.xml
M model/model-intest/testng-integration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Compare: https://github.com/Evolveum/midpoint/compare/6682db164414...e29c89164228