[midPoint-git] [Evolveum/midpoint] 85114f: show autocomplete list on focus even when field is...
Petr Gašparík
petr.gasparik at ami.cz
Thu Jun 2 23:45:47 CEST 2016
Branch: refs/heads/transifex
Home: https://github.com/Evolveum/midpoint
Commit: 85114f33a92263a1ff1b93d1e8beb3a216cbcc1a
https://github.com/Evolveum/midpoint/commit/85114f33a92263a1ff1b93d1e8beb3a216cbcc1a
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2016-05-30 (Mon, 30 May 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/TextPopupPanel.java
Log Message:
-----------
show autocomplete list on focus even when field is empty, item sorting added
Commit: ba114ab3ffe599fca0e6ccfff6b02813968e7e0c
https://github.com/Evolveum/midpoint/commit/ba114ab3ffe599fca0e6ccfff6b02813968e7e0c
Author: honchar <honchar at evolveum.com>
Date: 2016-05-30 (Mon, 30 May 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
Log Message:
-----------
attempt to fix null pointer ex in Request a role panel
Commit: d02fbd5bfc34ecfdaa811e1b34e915818316c705
https://github.com/Evolveum/midpoint/commit/d02fbd5bfc34ecfdaa811e1b34e915818316c705
Author: honchar <honchar at evolveum.com>
Date: 2016-05-30 (Mon, 30 May 2016)
Changed paths:
M .travis.yml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/BrowserPopupPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/BrowserPopupPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ComboPopupPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ComboPopupPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/DisplayableRenderer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFragmentBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPopupPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/TextPopupPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/TextPopupPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/BreakMode.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAccount.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyOrg.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestDependencies.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMappingInbound.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelCrudService.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuidNonUniqueName.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
M testing/conntest/src/test/resources/389ds/resource-dn-localhost.xml
M testing/conntest/src/test/resources/389ds/resource-nsuniqueid-bacchus.xml
M testing/conntest/src/test/resources/389ds/resource-nsuniqueid-localhost.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: bc6f5fd3137a26d546004895e704a019625240a7
https://github.com/Evolveum/midpoint/commit/bc6f5fd3137a26d546004895e704a019625240a7
Author: honchar <honchar at evolveum.com>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java
Log Message:
-----------
fixed caching image from the top right-corner user menu
Commit: 7bd736765c5023344daffb474fe425d6a22cc83b
https://github.com/Evolveum/midpoint/commit/7bd736765c5023344daffb474fe425d6a22cc83b
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
Log Message:
-----------
autocomplete styles fix on popup
Commit: a3ff48d0e64b5ecf4015201adf68d104a354ba70
https://github.com/Evolveum/midpoint/commit/a3ff48d0e64b5ecf4015201adf68d104a354ba70
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: d42a66d159bb0ecfcec9f0a306097dbd1c413f30
https://github.com/Evolveum/midpoint/commit/d42a66d159bb0ecfcec9f0a306097dbd1c413f30
Author: Ivan Noris <ivan.noris at evolveum.com>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
A samples/resources/oracle/resource-oracle-medium.xml
Log Message:
-----------
Oracle provisioning sample using Oracle ICF connector
Commit: 7443f24b4cc34fb6ce1e18c656239ec6a3434939
https://github.com/Evolveum/midpoint/commit/7443f24b4cc34fb6ce1e18c656239ec6a3434939
Author: honchar <honchar at evolveum.com>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
Log Message:
-----------
fixing message for delete org confirmation dialog
Commit: 2397c21d878ea6bc47fa2cdc89bef11d01f24190
https://github.com/Evolveum/midpoint/commit/2397c21d878ea6bc47fa2cdc89bef11d01f24190
Author: honchar <honchar at evolveum.com>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
A samples/resources/oracle/resource-oracle-medium.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 13cdf57605d9eca3b4c6cc8e23763d069f2dd81b
https://github.com/Evolveum/midpoint/commit/13cdf57605d9eca3b4c6cc8e23763d069f2dd81b
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/NonEmptyPropertyModel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/NonEmptyWrapperModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/dto/SearchFilterTypeDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/ConditionalSearchFilterEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/FilterUtils.java
Log Message:
-----------
Some filter-related fixes in RW (protected accounts, sync. conditions).
Commit: 7c690f2ba1211ffe94b6663f5c6a4ecbb52cd1f2
https://github.com/Evolveum/midpoint/commit/7c690f2ba1211ffe94b6663f5c6a4ecbb52cd1f2
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M .travis.yml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/BrowserPopupPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/BrowserPopupPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ComboPopupPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ComboPopupPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/DisplayableRenderer.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFragmentBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPopupPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/TextPopupPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/TextPopupPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/BreakMode.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAccount.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyOrg.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/PrismValueDeltaSetTripleProducer.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestDependencies.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestInbounds.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMappingInbound.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelCrudService.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestVolatility.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuidNonUniqueName.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchShadowOwnerTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
A samples/resources/oracle/resource-oracle-medium.xml
M testing/conntest/src/test/resources/389ds/resource-dn-localhost.xml
M testing/conntest/src/test/resources/389ds/resource-nsuniqueid-bacchus.xml
M testing/conntest/src/test/resources/389ds/resource-nsuniqueid-localhost.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 16266301538d0df5d4c01abbc1ac484b37b0633e
https://github.com/Evolveum/midpoint/commit/16266301538d0df5d4c01abbc1ac484b37b0633e
Author: Ivan Noris <ivan.noris at evolveum.com>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
Log Message:
-----------
Add/remove changed to Assign/unassign in org tree menu links
Commit: 4c3172860abd96fc4bcfc91d0eb587a0e99f2176
https://github.com/Evolveum/midpoint/commit/4c3172860abd96fc4bcfc91d0eb587a0e99f2176
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ResourceShadowDiscriminator.java
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
Log Message:
-----------
New method for shadow edit schema (+tests)
Commit: d9cc0336b4a64ad3273bfbba240493b681055aaf
https://github.com/Evolveum/midpoint/commit/d9cc0336b4a64ad3273bfbba240493b681055aaf
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2016-05-31 (Tue, 31 May 2016)
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/SearchItem.java
M infra/schema/src/main/resources/localization/schema.properties
M infra/schema/src/main/resources/localization/schema_en.properties
Log Message:
-----------
autocomplete styles fix on popup
Commit: 6293717e6cb3e701450773379baa0ed45c2b32b0
https://github.com/Evolveum/midpoint/commit/6293717e6cb3e701450773379baa0ed45c2b32b0
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAccount.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
Log Message:
-----------
More tests from BROKEN state. Still unable to reproduce.
Commit: 493ede811d02d71adf1f227c20811280fb20c1e9
https://github.com/Evolveum/midpoint/commit/493ede811d02d71adf1f227c20811280fb20c1e9
Author: Ivan Noris <ivan.noris at evolveum.com>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M samples/resources/oracle/resource-oracle-medium.xml
Log Message:
-----------
Fixed sample (xml elements ordering only), sorry
Commit: b5cf1fa1aa9890827ba4328770e99e5757066530
https://github.com/Evolveum/midpoint/commit/b5cf1fa1aa9890827ba4328770e99e5757066530
Author: honchar <honchar at evolveum.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
Log Message:
-----------
fixing NPE on the search panel; some fixes for request a role panel
Commit: bc866ef503dd39f5a6989d39b427754ae96efa1c
https://github.com/Evolveum/midpoint/commit/bc866ef503dd39f5a6989d39b427754ae96efa1c
Author: honchar <honchar at evolveum.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)
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/SearchItem.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAccount.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ResourceShadowDiscriminator.java
M infra/schema/src/main/resources/localization/schema.properties
M infra/schema/src/main/resources/localization/schema_en.properties
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
M samples/resources/oracle/resource-oracle-medium.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 2aefbe732c7ea5b48e7cff9c1c74040432de9728
https://github.com/Evolveum/midpoint/commit/2aefbe732c7ea5b48e7cff9c1c74040432de9728
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
addidng missing localization keys..
Commit: ff78a98e6ff710d2138e3a7959fa64e261c218be
https://github.com/Evolveum/midpoint/commit/ff78a98e6ff710d2138e3a7959fa64e261c218be
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.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/SearchItem.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAccount.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ResourceShadowDiscriminator.java
M infra/schema/src/main/resources/localization/schema.properties
M infra/schema/src/main/resources/localization/schema_en.properties
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
M samples/resources/oracle/resource-oracle-medium.xml
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Conflicts:
gui/admin-gui/src/main/resources/localization/Midpoint.properties
Commit: 923f74499202e17a22206dfe9dde7d53e048fe97
https://github.com/Evolveum/midpoint/commit/923f74499202e17a22206dfe9dde7d53e048fe97
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M gui/admin-gui/pom.xml
Log Message:
-----------
Excluding LDAP connector transitive dependencies.
Commit: 299eb18584b5aecea54628a4b90ca302209fd6c3
https://github.com/Evolveum/midpoint/commit/299eb18584b5aecea54628a4b90ca302209fd6c3
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
Log Message:
-----------
string ignore cache matching for search panel
Commit: b84b0b6cb0d95845652269469f75c67cf89946c7
https://github.com/Evolveum/midpoint/commit/b84b0b6cb0d95845652269469f75c67cf89946c7
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M gui/admin-gui/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: c09942b1db306a25c7a2d007144df2b433b5749e
https://github.com/Evolveum/midpoint/commit/c09942b1db306a25c7a2d007144df2b433b5749e
Author: Ivan Noris <ivan.noris at evolveum.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M samples/stories/multitenant-idm-saas/objectTemplates/object-template-org.xml
Log Message:
-----------
Strong mappings for assignment - otherwise they seem to collide with assignment from GUI (parent)
Commit: ef9daccf0abb36c9b1b56fcab9ceca1f58407458
https://github.com/Evolveum/midpoint/commit/ef9daccf0abb36c9b1b56fcab9ceca1f58407458
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
A infra/test-util/src/main/java/com/evolveum/midpoint/test/util/Lsof.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
Log Message:
-----------
lsof and file descriptor asserts in LDAP tests
Commit: 4edbd1e91f5ff597eee5eaa19343e09a4eef9d26
https://github.com/Evolveum/midpoint/commit/4edbd1e91f5ff597eee5eaa19343e09a4eef9d26
Author: honchar <honchar at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
Log Message:
-----------
fixing 500 error while sorting properties on the object edit page
Commit: f69448c5263691a83d67c58a5af1c563cb8e0c3e
https://github.com/Evolveum/midpoint/commit/f69448c5263691a83d67c58a5af1c563cb8e0c3e
Author: honchar <honchar at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
Log Message:
-----------
removed duplicated code
Commit: 8f00583842e636262068e661060ab9e137f9da34
https://github.com/Evolveum/midpoint/commit/8f00583842e636262068e661060ab9e137f9da34
Author: honchar <honchar at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M gui/admin-gui/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
A infra/test-util/src/main/java/com/evolveum/midpoint/test/util/Lsof.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
M samples/stories/multitenant-idm-saas/objectTemplates/object-template-org.xml
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 3d595d397855942c650cc679a7edc3586390ae0b
https://github.com/Evolveum/midpoint/commit/3d595d397855942c650cc679a7edc3586390ae0b
Author: Ivan Noris <ivan.noris at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M samples/stories/multitenant-idm-saas/objectTemplates/object-template-user.xml
Log Message:
-----------
Strong mappings also for user template...
Commit: eac6f15f0e9f2259a04944f5da335690479f70a9
https://github.com/Evolveum/midpoint/commit/eac6f15f0e9f2259a04944f5da335690479f70a9
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
A infra/test-util/src/main/java/com/evolveum/midpoint/test/util/Lsof.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
M samples/stories/multitenant-idm-saas/objectTemplates/object-template-org.xml
M samples/stories/multitenant-idm-saas/objectTemplates/object-template-user.xml
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 2bcbd003238bf22bcd0a0ad58eaafb4a908a7823
https://github.com/Evolveum/midpoint/commit/2bcbd003238bf22bcd0a0ad58eaafb4a908a7823
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M gui/admin-gui/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
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/SearchItem.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAccount.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ResourceShadowDiscriminator.java
M infra/schema/src/main/resources/localization/schema.properties
M infra/schema/src/main/resources/localization/schema_en.properties
A infra/test-util/src/main/java/com/evolveum/midpoint/test/util/Lsof.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
M samples/resources/oracle/resource-oracle-medium.xml
M samples/stories/multitenant-idm-saas/objectTemplates/object-template-org.xml
M samples/stories/multitenant-idm-saas/objectTemplates/object-template-user.xml
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: ea0c15cebdced4fbd21b37211f9186f17d57bedf
https://github.com/Evolveum/midpoint/commit/ea0c15cebdced4fbd21b37211f9186f17d57bedf
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
A infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ConnectorOperationalStatus.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/Lsof.java
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConfigurationTransformer.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ucf/TestUcfDummy.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
Log Message:
-----------
Connector statistics in UCF layer
Commit: a419eb1014cac222199c361519173ce412740505
https://github.com/Evolveum/midpoint/commit/a419eb1014cac222199c361519173ce412740505
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
Log Message:
-----------
ProvisioningService.getConnectorOperationalStatus()
Commit: ea8765b421521d6390d960c6c5811eac72f7f63e
https://github.com/Evolveum/midpoint/commit/ea8765b421521d6390d960c6c5811eac72f7f63e
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
fixing MID-3094 - Creating child organization with Keep displaying results shows "Illegal shadow state 'MODIFY'"
Commit: f01ef3a0b30707ac11e938dfb0345772feed949b
https://github.com/Evolveum/midpoint/commit/f01ef3a0b30707ac11e938dfb0345772feed949b
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
A infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ConnectorOperationalStatus.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/Lsof.java
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConfigurationTransformer.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ucf/TestUcfDummy.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 5dddf4b5b334746fb375443e2d2abf487fd3ed29
https://github.com/Evolveum/midpoint/commit/5dddf4b5b334746fb375443e2d2abf487fd3ed29
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M build-system/pom.xml
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractEDirTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
Log Message:
-----------
Updading connector instace and file descriptor asserts in the tests.
Commit: 81baa1c7abcc5b380913dbf36b2f6ac18ea1c62d
https://github.com/Evolveum/midpoint/commit/81baa1c7abcc5b380913dbf36b2f6ac18ea1c62d
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: d49dbff79c04f7d525d7faaa73b98a2f7473ea24
https://github.com/Evolveum/midpoint/commit/d49dbff79c04f7d525d7faaa73b98a2f7473ea24
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
Log Message:
-----------
[MID-3075] ResourceWizard - misleading OperationResult data displayed in Edit mapping
Commit: 5594eb5627de2cb7dedac9482ca938e86ddfadcf
https://github.com/Evolveum/midpoint/commit/5594eb5627de2cb7dedac9482ca938e86ddfadcf
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M build-system/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
A infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ConnectorOperationalStatus.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/Lsof.java
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConfigurationTransformer.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ucf/TestUcfDummy.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractEDirTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: ea89da210d6b4417d712c8614380b710fbb98526
https://github.com/Evolveum/midpoint/commit/ea89da210d6b4417d712c8614380b710fbb98526
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M samples/org/org-monkey-island-simple.xml
Log Message:
-----------
delete operation for org tree - delete for managers and members of focus type, updating sample for org struct
Commit: 2f429ed5dc3cf4bdfc158884d9db40735c0cf8a0
https://github.com/Evolveum/midpoint/commit/2f429ed5dc3cf4bdfc158884d9db40735c0cf8a0
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M build-system/pom.xml
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/NonEmptyPropertyModel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/NonEmptyWrapperModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/dto/SearchFilterTypeDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/ConditionalSearchFilterEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/FilterUtils.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractEDirTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 06a178051d85d979b0a05bc0f23b94d3cb7f9717
https://github.com/Evolveum/midpoint/commit/06a178051d85d979b0a05bc0f23b94d3cb7f9717
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceConnectorPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceConnectorPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ConnectorOperationalStatus.java
M infra/schema/src/main/resources/localization/schema.properties
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
Log Message:
-----------
Connector instance status tab in resource details
Commit: b56f4f88655bf85737fa0203005d9448b79e2778
https://github.com/Evolveum/midpoint/commit/b56f4f88655bf85737fa0203005d9448b79e2778
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M samples/org/org-monkey-island-simple.xml
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 8d0273a7d87eb54f0699365532350ebc4541fcaa
https://github.com/Evolveum/midpoint/commit/8d0273a7d87eb54f0699365532350ebc4541fcaa
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/DuplicateObjectTypeDetector.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ResourceObjectTypeDefinitionTypeDto.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M infra/common/pom.xml
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
Log Message:
-----------
RW: show warning when there are duplicate type definitions in schemaHandling or synchronization
Commit: 67abe49b76fecb054f9150ae1271b1d351251f6c
https://github.com/Evolveum/midpoint/commit/67abe49b76fecb054f9150ae1271b1d351251f6c
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceConnectorPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceConnectorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ConnectorOperationalStatus.java
M infra/schema/src/main/resources/localization/schema.properties
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
M samples/org/org-monkey-island-simple.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 0da9c90447704c6ac398784f6abe37f957670ab9
https://github.com/Evolveum/midpoint/commit/0da9c90447704c6ac398784f6abe37f957670ab9
Author: Petr Gašparík <petr.gasparik at ami.cz>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M .tx/config
M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
A infra/schema/src/main/resources/localization/schema_cs.properties
A infra/schema/src/main/resources/localization/schema_de.properties
M infra/schema/src/main/resources/localization/schema_en.properties
A infra/schema/src/main/resources/localization/schema_es.properties
A infra/schema/src/main/resources/localization/schema_es_AR.properties
A infra/schema/src/main/resources/localization/schema_et.properties
A infra/schema/src/main/resources/localization/schema_hi.properties
A infra/schema/src/main/resources/localization/schema_hu.properties
A infra/schema/src/main/resources/localization/schema_pt_BR.properties
A infra/schema/src/main/resources/localization/schema_ru.properties
A infra/schema/src/main/resources/localization/schema_sk.properties
A infra/schema/src/main/resources/localization/schema_tr.properties
Log Message:
-----------
Merge branch 'transifex'
# Conflicts:
# gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
Compare: https://github.com/Evolveum/midpoint/compare/aae241d00051...0da9c9044770
More information about the midPoint-svn
mailing list