[midPoint-git] [Evolveum/midpoint] b5811c: resource pages - adding task operations - import, ...
Katarina Valalikova
k.valalikova at evolveum.com
Sat Mar 26 19:29:07 CET 2016
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: b5811c31341bfbbc89498b252b5cb5f6c0e995dd
https://github.com/Evolveum/midpoint/commit/b5811c31341bfbbc89498b252b5cb5f6c0e995dd
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-03-26 (Sat, 26 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
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/column/ColumnUtils.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ListDataProvider2.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
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/server/PageTaskAdd.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.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/less/midpoint-theme.less
Log Message:
-----------
resource pages - adding task operations - import, liveSync, recon..
Commit: 1b8e97219ec3f75909ef9d64234ae3407d86fb40
https://github.com/Evolveum/midpoint/commit/1b8e97219ec3f75909ef9d64234ae3407d86fb40
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-03-26 (Sat, 26 Mar 2016)
Changed paths:
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/web/page/admin/resources/ResourceContentResourcePanel.java
Log Message:
-----------
new component - dropdown button
Commit: b93a478fff3c693de942a0b98de9a6454f08564c
https://github.com/Evolveum/midpoint/commit/b93a478fff3c693de942a0b98de9a6454f08564c
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-03-26 (Sat, 26 Mar 2016)
Changed paths:
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/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/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/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/server/PageTasks.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/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/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/SessionStorage.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 infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.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/AssociationFromLinkExpressionEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.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/TestPassword.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/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 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
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestFlatLdap.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Conflicts:
gui/admin-gui/src/main/resources/localization/Midpoint.properties
Commit: 695238220af4c34879c2869f160ea214eef418fe
https://github.com/Evolveum/midpoint/commit/695238220af4c34879c2869f160ea214eef418fe
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-03-26 (Sat, 26 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/button/DropdownButtonDto.java
M 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/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/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/util/ListDataProvider.java
M 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/page/admin/resources/ResourceContentPanel.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/resources/ResourceContentResourcePanel.html
M 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.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.java
M 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/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/dto/TaskAddDto.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/AssociationTargetSearchExpressionEvaluator.java
Log Message:
-----------
small cleanup + updating license headers
Compare: https://github.com/Evolveum/midpoint/compare/089397e7acd2...695238220af4
More information about the midPoint-svn
mailing list