[midPoint-git] [Evolveum/midpoint] 0d0898: some improvement for full text search
Pavol Mederly
mederly at evolveum.com
Thu Mar 2 18:46:24 CET 2017
Branch: refs/heads/feature/sod-certification
Home: https://github.com/Evolveum/midpoint
Commit: 0d089834a7334c9f7196c86d5f367bb340f79e4d
https://github.com/Evolveum/midpoint/commit/0d089834a7334c9f7196c86d5f367bb340f79e4d
Author: honchar <honchar at evolveum.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
Log Message:
-----------
some improvement for full text search
Commit: 5062b45e851b43edefdc83cd4ffc5246c0c20e43
https://github.com/Evolveum/midpoint/commit/5062b45e851b43edefdc83cd4ffc5246c0c20e43
Author: honchar <honchar at evolveum.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
Log Message:
-----------
some more improvement for full text search
Commit: f6b783a4b2ba7c61b4b5792a7cd654ae4d22c762
https://github.com/Evolveum/midpoint/commit/f6b783a4b2ba7c61b4b5792a7cd654ae4d22c762
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
Changed paths:
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
M testing/conntest/src/test/resources/truststore.jks
Log Message:
-----------
Conntest AD certification update
Commit: da7046439206f1726f724c54b18b72c949fb7c22
https://github.com/Evolveum/midpoint/commit/da7046439206f1726f724c54b18b72c949fb7c22
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
M testing/conntest/src/test/resources/truststore.jks
Log Message:
-----------
Merge branch 'master' into feature/sod-certification
Commit: c8517b461f4490aaf39025f127f42690915846c6
https://github.com/Evolveum/midpoint/commit/c8517b461f4490aaf39025f127f42690915846c6
Author: honchar <honchar at evolveum.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
Log Message:
-----------
MID-3693 Assignment request comment field improvement
Commit: ab5cbf04501b09337ce0d1e8e1f9362bc04ab69a
https://github.com/Evolveum/midpoint/commit/ab5cbf04501b09337ce0d1e8e1f9362bc04ab69a
Author: honchar <honchar at evolveum.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
Changed paths:
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
M testing/conntest/src/test/resources/truststore.jks
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 64679606a91e58a8850d8f639a365ab9185530b0
https://github.com/Evolveum/midpoint/commit/64679606a91e58a8850d8f639a365ab9185530b0
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
Changed paths:
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
Log Message:
-----------
Fixed mapping range related logging message.
Commit: 5711993d3e7da5174b2d0b5f8cc90cfbd17038cb
https://github.com/Evolveum/midpoint/commit/5711993d3e7da5174b2d0b5f8cc90cfbd17038cb
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
Changed paths:
A config/rest/swagger.yml
Log Message:
-----------
swagger rest api yaml doc
Commit: 6423d23fa2556704a60e7e419275a49b9b3a2629
https://github.com/Evolveum/midpoint/commit/6423d23fa2556704a60e7e419275a49b9b3a2629
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
M testing/conntest/src/test/resources/truststore.jks
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 2c8c07a4153de1f6c65f90f402e6346fad1d21ad
https://github.com/Evolveum/midpoint/commit/2c8c07a4153de1f6c65f90f402e6346fad1d21ad
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
Log Message:
-----------
Mapping range is checked only if condition is true (old or new one).
Commit: 1f4804b402953dc1f5fd0a9c6e57c8946f632829
https://github.com/Evolveum/midpoint/commit/1f4804b402953dc1f5fd0a9c6e57c8946f632829
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
A config/rest/swagger.yml
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: eb3526b550eb4814808fd681ec62fc8513589356
https://github.com/Evolveum/midpoint/commit/eb3526b550eb4814808fd681ec62fc8513589356
Author: honchar <honchar at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
Log Message:
-----------
Search box default configuration (taken from sysConfig)
Commit: 06a1add5c2294af6cd1558f7bbb10f3d074dea56
https://github.com/Evolveum/midpoint/commit/06a1add5c2294af6cd1558f7bbb10f3d074dea56
Author: honchar <honchar at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
A config/rest/swagger.yml
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 8b6ab87a8f88a98fc35dff1f85e073dcc6166f43
https://github.com/Evolveum/midpoint/commit/8b6ab87a8f88a98fc35dff1f85e073dcc6166f43
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointAbstractProvider.java
A samples/rest/query-paging.xml
Log Message:
-----------
fixing query parsing for REST, adding additional sample for query
Commit: 11cc533819b37e19c7236457cb9e378833663936
https://github.com/Evolveum/midpoint/commit/11cc533819b37e19c7236457cb9e378833663936
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: f2e3bc8778ce6226b754ac65ee97fe958715b818
https://github.com/Evolveum/midpoint/commit/f2e3bc8778ce6226b754ac65ee97fe958715b818
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestJsonProvider.java
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestXmlProvider.java
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestYamlProvider.java
Log Message:
-----------
improving error hanlding - REST API
Commit: ba3982d873f70db65b25e72af0db442af115a813
https://github.com/Evolveum/midpoint/commit/ba3982d873f70db65b25e72af0db442af115a813
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
M model/model-impl/src/test/resources/common/system-configuration.xml
Log Message:
-----------
Global policy rules also for assignments.
Commit: 2cb2fc4220abe076e6cf764d0d804253ec87e000
https://github.com/Evolveum/midpoint/commit/2cb2fc4220abe076e6cf764d0d804253ec87e000
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
M model/workflow-impl/testng-integration.xml
Log Message:
-----------
Workflow tests with global policy rules for assignments.
Commit: a9385c415996315c3bf727db94f5ca457bfe4a63
https://github.com/Evolveum/midpoint/commit/a9385c415996315c3bf727db94f5ca457bfe4a63
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestJsonProvider.java
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestXmlProvider.java
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestYamlProvider.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 17cb2a877cabcce568c565519d5e0cc659eb5fe3
https://github.com/Evolveum/midpoint/commit/17cb2a877cabcce568c565519d5e0cc659eb5fe3
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M config/rest/swagger.yml
M gui/admin-gui/pom.xml
Log Message:
-----------
swagger documentation + generated index.html
Commit: 420f2cedd496c703d864d0622ffcfbf83dd421ff
https://github.com/Evolveum/midpoint/commit/420f2cedd496c703d864d0622ffcfbf83dd421ff
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
M model/model-impl/src/test/resources/common/system-configuration.xml
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
M model/workflow-impl/testng-integration.xml
Log Message:
-----------
Merge branches 'master' and 'master' of https://github.com/Evolveum/midpoint
Commit: 833b7ff2d588d30e01c9ea99243f8ec776a0868e
https://github.com/Evolveum/midpoint/commit/833b7ff2d588d30e01c9ea99243f8ec776a0868e
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
A config/rest/index.html
Log Message:
-----------
generated swagger doc
Commit: aca1ad7c4edbd5cb2edd787882eabfd47d1f433b
https://github.com/Evolveum/midpoint/commit/aca1ad7c4edbd5cb2edd787882eabfd47d1f433b
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
M testing/story/src/test/resources/strings/roles-specific/a-test-1.xml
M testing/story/src/test/resources/strings/roles-specific/a-test-2a.xml
M testing/story/src/test/resources/strings/roles-specific/a-test-2b.xml
M testing/story/src/test/resources/strings/roles-specific/a-test-3a.xml
M testing/story/src/test/resources/strings/roles-specific/a-test-3b.xml
M testing/story/src/test/resources/strings/roles-specific/a-test-3x.xml
M testing/story/src/test/resources/strings/roles-specific/a-test-3y.xml
M testing/story/src/test/resources/strings/roles-specific/a-test-4.xml
A testing/story/src/test/resources/strings/roles/global-policy-rules.xml
R testing/story/src/test/resources/strings/roles/metarole-approval-escalation-then-rejection.xml
R testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
R testing/story/src/test/resources/strings/roles/metarole-approval-rejection.xml
R testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-security.xml
R testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
M testing/story/testng-integration.xml
Log Message:
-----------
Simplified TestStrings story test by using global policy rules.
Commit: 39c5fdd045687b989a7c8ee86f1c6c112e79ccf1
https://github.com/Evolveum/midpoint/commit/39c5fdd045687b989a7c8ee86f1c6c112e79ccf1
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
A config/rest/index.html
M config/rest/swagger.yml
M gui/admin-gui/pom.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 406405e44e4cc736f86c7f9254e296b1c48d39b2
https://github.com/Evolveum/midpoint/commit/406405e44e4cc736f86c7f9254e296b1c48d39b2
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestSimpleCompletion.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
Log Message:
-----------
Storing operation business context in workflow process (in "process created" event).
Commit: 0e2d36add7ad86689199b0c230ff4e87037add8a
https://github.com/Evolveum/midpoint/commit/0e2d36add7ad86689199b0c230ff4e87037add8a
Author: honchar <honchar at evolveum.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
Requester comment fiels is added to work item page
Commit: c4b42ab46d05aa72fcec26f06b6c16b712af52bd
https://github.com/Evolveum/midpoint/commit/c4b42ab46d05aa72fcec26f06b6c16b712af52bd
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
Changed paths:
A config/rest/index.html
A config/rest/swagger.yml
M gui/admin-gui/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
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/ModelRestService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointAbstractProvider.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
M model/model-impl/src/test/resources/common/system-configuration.xml
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestSimpleCompletion.java
M model/workflow-impl/testng-integration.xml
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
A samples/rest/query-paging.xml
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestJsonProvider.java
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestXmlProvider.java
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestYamlProvider.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
M testing/story/src/test/resources/strings/roles-specific/a-test-1.xml
M testing/story/src/test/resources/strings/roles-specific/a-test-2a.xml
M testing/story/src/test/resources/strings/roles-specific/a-test-2b.xml
M testing/story/src/test/resources/strings/roles-specific/a-test-3a.xml
M testing/story/src/test/resources/strings/roles-specific/a-test-3b.xml
M testing/story/src/test/resources/strings/roles-specific/a-test-3x.xml
M testing/story/src/test/resources/strings/roles-specific/a-test-3y.xml
M testing/story/src/test/resources/strings/roles-specific/a-test-4.xml
A testing/story/src/test/resources/strings/roles/global-policy-rules.xml
R testing/story/src/test/resources/strings/roles/metarole-approval-escalation-then-rejection.xml
R testing/story/src/test/resources/strings/roles/metarole-approval-line-managers.xml
R testing/story/src/test/resources/strings/roles/metarole-approval-rejection.xml
R testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
M testing/story/src/test/resources/strings/roles/metarole-approval-security.xml
R testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml
M testing/story/testng-integration.xml
Log Message:
-----------
Merge branch 'master' into feature/sod-certification
# Conflicts:
# model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
Commit: 650afd61168ca8ad2f186bce6dcf98502e46e4ae
https://github.com/Evolveum/midpoint/commit/650afd61168ca8ad2f186bce6dcf98502e46e4ae
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/sod-certification
Commit: 1226980c28e49f64cd6bc4922d989c5b1d1ba563
https://github.com/Evolveum/midpoint/commit/1226980c28e49f64cd6bc4922d989c5b1d1ba563
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
M testing/story/src/test/resources/strings/roles/global-policy-rules.xml
Log Message:
-----------
Fixed story sample + minor GUI 'null' issue
Commit: ca2ab3c3563d937bf640cd9c8ddc0b83ef5f0864
https://github.com/Evolveum/midpoint/commit/ca2ab3c3563d937bf640cd9c8ddc0b83ef5f0864
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
Changed paths:
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.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/SoDCertificationTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
Log Message:
-----------
SoD certification test.
Commit: 09602fbb4b5f1389d2fb17cd7fba5630a99c8664
https://github.com/Evolveum/midpoint/commit/09602fbb4b5f1389d2fb17cd7fba5630a99c8664
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
Changed paths:
A samples/certification/sod/a-test-2a.xml
A samples/certification/sod/a-test-2b.xml
A samples/certification/sod/a-test-3a.xml
A samples/certification/sod/a-test-3b.xml
A samples/certification/sod/a-test-3x.xml
A samples/certification/sod/a-test-3y.xml
A samples/certification/sod/sod-certification.xml
A samples/certification/sod/user-jack.xml
Log Message:
-----------
SoD certification samples.
Commit: 61954b37f118cf47ca5fa208475c0f210fbb162e
https://github.com/Evolveum/midpoint/commit/61954b37f118cf47ca5fa208475c0f210fbb162e
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/CertGuiHandlerRegistry.java
Log Message:
-----------
GUI fixes related to SoD certification.
Compare: https://github.com/Evolveum/midpoint/compare/6f9034498431...61954b37f118
More information about the midPoint-svn
mailing list