[midPoint-git] [Evolveum/midpoint] 7c59b9: Help button on the Propagation password panel on C...

honchar honchar at evolveum.com
Fri Apr 8 01:16:56 CEST 2016 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 7c59b9d15593b9df84eddc305a31de5bfa4b4c1b
      https://github.com/Evolveum/midpoint/commit/7c59b9d15593b9df84eddc305a31de5bfa4b4c1b
  Author: honchar <honchar at evolveum.com>
  Date:   2016-04-08 (Fri, 08 Apr 2016)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/HelpInfoPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/HelpInfoPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Help button on the Propagation password panel on Credentials page


  Commit: 8dcc96913a25c3b61faefe2ee2fe91cbcb8a0bf1
      https://github.com/Evolveum/midpoint/commit/8dcc96913a25c3b61faefe2ee2fe91cbcb8a0bf1
  Author: honchar <honchar at evolveum.com>
  Date:   2016-04-08 (Fri, 08 Apr 2016)

  Changed paths:
    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/page/admin/server/TaskSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java

  Log Message:
  -----------
  some date components are formatted according to user's locale and time zone


  Commit: bbac97ab6da9379ebfb46c53d328111ff8edc13d
      https://github.com/Evolveum/midpoint/commit/bbac97ab6da9379ebfb46c53d328111ff8edc13d
  Author: honchar <honchar at evolveum.com>
  Date:   2016-04-08 (Fri, 08 Apr 2016)

  Changed paths:
    M config/sql/midpoint/3.4/h2/h2-3.4.sql
    A config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-4.sql
    M config/sql/midpoint/3.4/mysql/mysql-3.4.sql
    A config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-4.sql
    M config/sql/midpoint/3.4/oracle/oracle-3.4.sql
    A config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-4.sql
    M config/sql/midpoint/3.4/postgresql/postgresql-3.4.sql
    A config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-4.sql
    M config/sql/midpoint/3.4/sqlserver/sqlserver-3.4.sql
    A config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-4.sql
    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/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/AjaxTabbedPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AsyncUpdatePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AsyncUpdatePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.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/BoxedTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableHeadersToolbar.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnTypeDto.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/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/show/SceneDto.java
    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/prism/show/WrapperScene.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/AutoRefreshDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/AutoRefreshPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/Refreshable.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/page/admin/certification/PageCertDefinition.java
    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
    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.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.java
    M 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/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/TaskButtonsVisibility.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskChangesDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskChangesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskChangesPanel.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/TaskOperationTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskPerformanceTabPanel.java
    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.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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskShowAdvancedFeaturesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskShowAdvancedFeaturesPanel.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/TaskSummaryPanel.html
    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/TaskTabsVisibility.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfChildPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfParentPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWfParentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWorkTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/TaskCurrentStateDtoModel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/ApprovalOutcomeIcon.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/dto/TaskDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProviderOptions.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageAdminServices.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ServiceSummaryPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ServiceSummaryPanel.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/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkflowRequestsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.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/WorkItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.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/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java
    M gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml
    A gui/admin-gui/src/main/resources/initial-objects/120-security-policy.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/R_AtomicFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_ConditionEntry.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/common-forms-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/extension-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/process-instance-state-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/visualizer/Scene.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/UserComputer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAuthenticationEvaluator.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/TestResources.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-red.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/common/role-pirate.xml
    M model/workflow-api/pom.xml
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
    A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/ChangesByState.java
    M model/workflow-impl/pom.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareResult.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/ObjectTreeDeltas.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpWfTask.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareChildOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareRootOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTask.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.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
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    A samples/objects/security-policy-lockout.xml
    M testing/conntest/pom.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractEDirTest.java
    M testing/longtest/pom.xml
    M testing/rest/pom.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractLdapHierarchyTest.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDeeplyHierarchical.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestRetirement.java
    A testing/story/src/test/resources/ldap-deeply-hierarchical/org-top.xml
    A testing/story/src/test/resources/ldap-deeply-hierarchical/resource-opendj.xml
    A testing/story/src/test/resources/ldap-deeply-hierarchical/role-meta-org.xml
    A testing/story/src/test/resources/retirement/org-retired.xml
    A testing/story/src/test/resources/retirement/org-top.xml
    A testing/story/src/test/resources/retirement/resource-opendj.xml
    A testing/story/src/test/resources/retirement/role-meta-org.xml
    M testing/story/testng-integration.xml
    M testing/wstest/pom.xml

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

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java


  Commit: 575d8ae7c765fa62342bbd3252c1af98ed6f9107
      https://github.com/Evolveum/midpoint/commit/575d8ae7c765fa62342bbd3252c1af98ed6f9107
  Author: honchar <honchar at evolveum.com>
  Date:   2016-04-08 (Fri, 08 Apr 2016)

  Changed paths:
    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/page/admin/certification/dto/CertCampaignDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDto.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.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEditOld.html
    R 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.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/TaskButtonsVisibility.java
    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/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/TaskSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTabsVisibility.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskWorkTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/ActionsExecutedInformationPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/currentState/ActionsExecutedInformationPanel.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/TaskStatePanel.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/subtasks/SubtasksPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/workflowInformation/WorkflowInformationPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/workflowInformation/WorkflowInformationPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

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


Compare: https://github.com/Evolveum/midpoint/compare/2ef730f4958a...575d8ae7c765

More information about the midPoint-svn mailing list