[midPoint-git] [Evolveum/midpoint] 751645: Reworking task page - first steps.

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 7516455cd399875cee7dc3922cdc54f2fffb94a7
      https://github.com/Evolveum/midpoint/commit/7516455cd399875cee7dc3922cdc54f2fffb94a7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask2.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Reworking task page - first steps.


  Commit: ca7cb17c315ccf800f757ce480c43a3457f53ec4
      https://github.com/Evolveum/midpoint/commit/ca7cb17c315ccf800f757ce480c43a3457f53ec4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-24 (Thu, 24 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.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/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask2.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask2.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Started work on task basic and scheduling tabs.


  Commit: e5d25b246aa077020cfe702c0d0e4a363285c4e7
      https://github.com/Evolveum/midpoint/commit/e5d25b246aa077020cfe702c0d0e4a363285c4e7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskApprovalsTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskApprovalsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskPerformanceTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskPerformanceTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskProgressTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskProgressTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Interim commit before merge.


  Commit: d44622fcfd5b943a1c6ec9b6ee415d7061439f94
      https://github.com/Evolveum/midpoint/commit/d44622fcfd5b943a1c6ec9b6ee415d7061439f94
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-29 (Tue, 29 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/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/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/self/PageSelfCredentials.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/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
    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-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
    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

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/new-approval-gui

# Conflicts:
#	gui/admin-gui/src/main/resources/localization/Midpoint.properties


  Commit: 9fda82bdb91653d358b3169f95618ef8d4c1fd95
      https://github.com/Evolveum/midpoint/commit/9fda82bdb91653d358b3169f95618ef8d4c1fd95
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M samples/resources/scriptedrest/confluence-wiki/SchemaScript.groovy
    M samples/resources/scriptedrest/confluence-wiki/SearchScript.groovy
    M samples/resources/scriptedrest/jira/SchemaScript.groovy
    M samples/resources/scriptedrest/jira/SearchScript.groovy

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/new-approval-gui


  Commit: 1a5e6ce9749264e6e0266b41dd71b616bff3e778
      https://github.com/Evolveum/midpoint/commit/1a5e6ce9749264e6e0266b41dd71b616bff3e778
  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/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/operationStatus/ModelOperationStatusPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/operationStatus/ModelOperationStatusPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/DecisionsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalHistoryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskApprovalsTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskApprovalsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskOperationTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskOperationTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskProgressTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskProgressTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskStatesAndActionsTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskStatesAndActionsTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSubtasksAndThreadsTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSubtasksAndThreadsTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/IterativeInformationPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/IterativeInformationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/TaskCurrentStateDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/workflowInformation/WorkflowInformationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstance.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceNewDto.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/session/UserProfileStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/BaseProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/DefaultProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java

  Log Message:
  -----------
  New tabs on Task page: Subtasks, Progress, States/Actions, Performance, Approvals, Operation context, Result.


  Commit: 019d6539bc49e6f798d59d7626cb0ba1d0e31363
      https://github.com/Evolveum/midpoint/commit/019d6539bc49e6f798d59d7626cb0ba1d0e31363
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-30 (Wed, 30 Mar 2016)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectSummaryPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectSummaryPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ReadonlyPrismObjectFromObjectWrapperModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/TaskCurrentStateDtoModel.java

  Log Message:
  -----------
  Refactored Focus/ObjectSummaryPanel. Added auto-update of task info.


  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


  Commit: 72ec202df957e5c49c5df0949ba6106f6ddc1888
      https://github.com/Evolveum/midpoint/commit/72ec202df957e5c49c5df0949ba6106f6ddc1888
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-31 (Thu, 31 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/web/component/AbstractSummaryPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask2.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java

  Log Message:
  -----------
  Task buttons. View/edit mode. Basic tab finished.


  Commit: 498797215a9dd115c3db55440810bf7d879a53c9
      https://github.com/Evolveum/midpoint/commit/498797215a9dd115c3db55440810bf7d879a53c9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-31 (Thu, 31 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/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/objectdetails/FocusAssignmentsTabPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    A samples/resources/scriptedrest/bitbucket/CreateScript.groovy
    A samples/resources/scriptedrest/bitbucket/DeleteScript.groovy
    A samples/resources/scriptedrest/bitbucket/SchemaScript.groovy
    A samples/resources/scriptedrest/bitbucket/SearchScript.groovy
    A samples/resources/scriptedrest/bitbucket/TestScript.groovy
    A samples/resources/scriptedrest/bitbucket/UpdateScript.groovy
    A samples/resources/scriptedrest/bitbucket/bitbucket.default.png
    A samples/resources/scriptedrest/bitbucket/resource.xml
    M samples/resources/scriptedrest/confluence-wiki/resource.xml
    M samples/resources/scriptedrest/jira/resource.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/new-approval-gui


  Commit: 745cf7fd78bc4b1aabe87617e6efa8f38064e0de
      https://github.com/Evolveum/midpoint/commit/745cf7fd78bc4b1aabe87617e6efa8f38064e0de
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-31 (Thu, 31 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskObjectsTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskObjectsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSubtasksAndThreadsTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSubtasksAndThreadsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties

  Log Message:
  -----------
  Objects tab. Edit mode. Does not return to task list after task action is executed.


  Commit: 1356c663976eadd2971c2002c96cb4ee4da9f457
      https://github.com/Evolveum/midpoint/commit/1356c663976eadd2971c2002c96cb4ee4da9f457
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-31 (Thu, 31 Mar 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectSummaryPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/operationStatus/ModelOperationStatusPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/operationStatus/ModelOperationStatusPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.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/show/SceneUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/DecisionsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalHistoryPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ReadonlyPrismObjectFromObjectWrapperModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask2.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask2.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskApprovalsTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskApprovalsTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskObjectsTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskObjectsTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskOperationTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskOperationTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskPerformanceTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskPerformanceTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskProgressTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskProgressTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskStatesAndActionsTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskStatesAndActionsTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSubtasksAndThreadsTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSubtasksAndThreadsTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/IterativeInformationPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/IterativeInformationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/TaskCurrentStateDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/TaskCurrentStateDtoModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/workflowInformation/WorkflowInformationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstance.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceNewDto.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/session/UserProfileStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/BaseProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/DefaultProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java

  Log Message:
  -----------
  Merge branch 'feature/new-approval-gui'


  Commit: 821b0b15d97a24a5b11798f6adc3f29d59bb6cb0
      https://github.com/Evolveum/midpoint/commit/821b0b15d97a24a5b11798f6adc3f29d59bb6cb0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-31 (Thu, 31 Mar 2016)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ReadOnlyPrismObjectFromObjectWrapperModel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/ReadonlyPrismObjectFromObjectWrapperModel.java

  Log Message:
  -----------
  Fixing wrong class name.


  Commit: 09b265b1b6ce40906b8f8e05813d8c3243e445fe
      https://github.com/Evolveum/midpoint/commit/09b265b1b6ce40906b8f8e05813d8c3243e445fe
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-31 (Thu, 31 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/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.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
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask2.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEditOld.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEditOld.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/TaskBasicTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskObjectsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSubtasksAndThreadsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/IterativeInformationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/SynchronizationInformationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/TaskStatePanel.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/WorkflowRequestsPanel.java

  Log Message:
  -----------
  Renaming original page to PageTaskOld and new one to PageTaskEdit.


  Commit: f238eacc6ccf6c1cffd6719f9a519d42b6b997da
      https://github.com/Evolveum/midpoint/commit/f238eacc6ccf6c1cffd6719f9a519d42b6b997da
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-03-31 (Thu, 31 Mar 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractLdapHierarchyTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapFlat.java
    M testing/story/src/test/resources/flat-ldap/role-meta-org.xml
    M testing/story/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/8d79462bf1b3...f238eacc6ccf