[midPoint-git] [Evolveum/midpoint] 2ec58f: comment debug image write to disk
Pavol Mederly
mederly at evolveum.com
Wed Mar 30 21:30:28 CEST 2016
Branch: refs/heads/feature/new-approval-gui
Home: https://github.com/Evolveum/midpoint
Commit: 2ec58ff287cd3f8b81c1976f9f7435f7e2601386
https://github.com/Evolveum/midpoint/commit/2ec58ff287cd3f8b81c1976f9f7435f7e2601386
Author: gpalos <gustav.palos at gmail.com>
Date: 2016-03-29 (Tue, 29 Mar 2016)
Changed paths:
M samples/resources/scriptedrest/confluence-wiki/UpdateScript.groovy
Log Message:
-----------
comment debug image write to disk
Commit: d983986cb773ea00d8c063651188fe57ce59ed54
https://github.com/Evolveum/midpoint/commit/d983986cb773ea00d8c063651188fe57ce59ed54
Author: honchar <honchar at evolveum.com>
Date: 2016-03-30 (Wed, 30 Mar 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java
Log Message:
-----------
MID-2742
Commit: 102f78fe5de1e92d0ad91aa947a1d37c44ff89c2
https://github.com/Evolveum/midpoint/commit/102f78fe5de1e92d0ad91aa947a1d37c44ff89c2
Author: honchar <honchar at evolveum.com>
Date: 2016-03-30 (Wed, 30 Mar 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxSubmitButton.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider2.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/LinkPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuLinkPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractFocusTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/BaseFocusPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusDetailsTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.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/prism/SimpleErrorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/sample/SampleFormFocusTabPanel.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/SearchPanel.html
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/component/util/ListDataProvider.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ListDataProvider2.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.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/configuration/PageDebugView.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LoggingDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/dto/ObjectViewDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskAddDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/FocusProjectionDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/FocusSubwrapperDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/SimpleUserResourceProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstances.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDtoProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TaskOperationUtils.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
M gui/admin-gui/src/main/webapp/js/midpoint-theme.js
M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaToDomProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismContext.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/AuthenticationEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluatorFactory.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.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/security/PasswordCallback.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/RepositoryException.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationInjectorInterceptor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/WsFaultListener.java
M model/model-impl/src/main/resources/ctx-model.xml
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAuthenticationEvaluator.java
A model/model-impl/src/test/resources/common/security-policy.xml
M model/model-impl/src/test/resources/common/system-configuration.xml
M model/model-impl/src/test/resources/common/user-guybrush.xml
M model/model-impl/testng-unit.xml
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/TestPassword.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
M model/model-intest/src/test/resources/common/user-template-complex.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
A model/workflow-impl/src/test/resources/common/security-policy.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.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/test/impl/TestDummy.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/ConnectionEnvironment.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipal.java
M repo/security-impl/pom.xml
A repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/TestEmpty.java
A repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/UserProfileServiceMock.java
A repo/security-impl/src/test/resources/ctx-security-test-main.xml
A repo/security-impl/src/test/resources/ctx-security-test.xml
A repo/security-impl/src/test/resources/logback-test.xml
A repo/security-impl/src/test/resources/security-policy.xml
A repo/security-impl/src/test/resources/system-configuration.xml
A repo/security-impl/src/test/resources/user-jack.xml
M repo/security-impl/testng-integration.xml
M samples/resources/scriptedrest/confluence-wiki/SchemaScript.groovy
M samples/resources/scriptedrest/confluence-wiki/SearchScript.groovy
M samples/resources/scriptedrest/confluence-wiki/UpdateScript.groovy
M samples/resources/scriptedrest/jira/SchemaScript.groovy
M samples/resources/scriptedrest/jira/SearchScript.groovy
M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
M testing/rest/src/test/resources/logback-test.xml
M testing/rest/src/test/resources/repo/system-configuration.xml
A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestFlatLdap.java
A testing/story/src/test/resources/flat-ldap/org-top.xml
A testing/story/src/test/resources/flat-ldap/resource-opendj.xml
A testing/story/src/test/resources/flat-ldap/role-meta-org.xml
M testing/story/src/test/resources/science/resource-dummy-unix.xml
M testing/story/testng-integration.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: f60a021c672c5820b1858a8f4fe31e7da9c1bfa5
https://github.com/Evolveum/midpoint/commit/f60a021c672c5820b1858a8f4fe31e7da9c1bfa5
Author: gpalos <gustav.palos at gmail.com>
Date: 2016-03-30 (Wed, 30 Mar 2016)
Changed paths:
M samples/resources/scriptedrest/confluence-wiki/CreateScript.groovy
M samples/resources/scriptedrest/confluence-wiki/SchemaScript.groovy
M samples/resources/scriptedrest/confluence-wiki/resource.xml
M samples/resources/scriptedrest/jira/CreateScript.groovy
M samples/resources/scriptedrest/jira/SchemaScript.groovy
M samples/resources/scriptedrest/jira/resource.xml
Log Message:
-----------
detect user already exists in create scripts
Commit: 20ed35e3260df2f5610bedbc1c870a8bf6ff87c6
https://github.com/Evolveum/midpoint/commit/20ed35e3260df2f5610bedbc1c870a8bf6ff87c6
Author: honchar <honchar at evolveum.com>
Date: 2016-03-30 (Wed, 30 Mar 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError403.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
MID-2677
Commit: 9a77b1a9c78f4cbb8375490de3cd828b7f16a52b
https://github.com/Evolveum/midpoint/commit/9a77b1a9c78f4cbb8375490de3cd828b7f16a52b
Author: honchar <honchar at evolveum.com>
Date: 2016-03-30 (Wed, 30 Mar 2016)
Changed paths:
M samples/resources/scriptedrest/confluence-wiki/CreateScript.groovy
M samples/resources/scriptedrest/confluence-wiki/SchemaScript.groovy
M samples/resources/scriptedrest/confluence-wiki/resource.xml
M samples/resources/scriptedrest/jira/CreateScript.groovy
M samples/resources/scriptedrest/jira/SchemaScript.groovy
M samples/resources/scriptedrest/jira/resource.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 83420d5f8e9b7f2fbd3fd833d24da92bb64a1dd3
https://github.com/Evolveum/midpoint/commit/83420d5f8e9b7f2fbd3fd833d24da92bb64a1dd3
Author: honchar <honchar at evolveum.com>
Date: 2016-03-30 (Wed, 30 Mar 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
Log Message:
-----------
MID-2805
Commit: 3ec8a86982fb6e8630e4d225d3ab11fd71898f7a
https://github.com/Evolveum/midpoint/commit/3ec8a86982fb6e8630e4d225d3ab11fd71898f7a
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2016-03-30 (Wed, 30 Mar 2016)
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/SearchPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/webapp/js/midpoint-theme.js
Log Message:
-----------
advanced search improvements
Commit: abacadc0b2b470cf01343cb40670fc36508ce946
https://github.com/Evolveum/midpoint/commit/abacadc0b2b470cf01343cb40670fc36508ce946
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2016-03-30 (Wed, 30 Mar 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError403.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: f54bd063fe2e648c0794688f93bd2b2a79814365
https://github.com/Evolveum/midpoint/commit/f54bd063fe2e648c0794688f93bd2b2a79814365
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2016-03-30 (Wed, 30 Mar 2016)
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/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/roles/PageRoles.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
Log Message:
-----------
MID-2548 remembering searches
Commit: 341073ca836ba0595593474312879daf55e7171c
https://github.com/Evolveum/midpoint/commit/341073ca836ba0595593474312879daf55e7171c
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2016-03-30 (Wed, 30 Mar 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.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 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/configuration/component/ChooseTypePanel.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/roles/PageRoles.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/error/PageError.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError403.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/webapp/js/midpoint-theme.js
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M samples/resources/scriptedrest/confluence-wiki/CreateScript.groovy
M samples/resources/scriptedrest/confluence-wiki/SchemaScript.groovy
M samples/resources/scriptedrest/confluence-wiki/UpdateScript.groovy
M samples/resources/scriptedrest/confluence-wiki/resource.xml
M samples/resources/scriptedrest/jira/CreateScript.groovy
M samples/resources/scriptedrest/jira/SchemaScript.groovy
M samples/resources/scriptedrest/jira/resource.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/new-approval-gui
# Conflicts:
# gui/admin-gui/src/main/resources/localization/Midpoint.properties
Compare: https://github.com/Evolveum/midpoint/compare/019d6539bc49...341073ca836b
More information about the midPoint-svn
mailing list