[midPoint-git] [Evolveum/midpoint] 3a53c2: resource pages - rework..

Katarina Valalikova k.valalikova at evolveum.com
Fri Jan 22 13:26:23 CET 2016 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 3a53c24da068485eb75319f27e4fa1ab3aaa4b30
      https://github.com/Evolveum/midpoint/commit/3a53c24da068485eb75319f27e4fa1ab3aaa4b30
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-01-13 (Wed, 13 Jan 2016)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBox.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBox.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/OpResult.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceOld.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceOld.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java

  Log Message:
  -----------
  resource pages - rework..


  Commit: 4df609f5aadaff8291161ea5503f45f789e43d1d
      https://github.com/Evolveum/midpoint/commit/4df609f5aadaff8291161ea5503f45f789e43d1d
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-01-15 (Fri, 15 Jan 2016)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBoxPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBoxPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBoxType.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesDto.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/CapabilitiesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractEDirTest.java

  Log Message:
  -----------
  resource pages - added table for schema handling object types..


  Commit: 638673b1342cf450e3ca1c8d0e83e202773691f1
      https://github.com/Evolveum/midpoint/commit/638673b1342cf450e3ca1c8d0e83e202773691f1
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-01-17 (Sun, 17 Jan 2016)

  Changed paths:
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBox.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBox.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnTypeDto.java
    A 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/page/PageTemplate.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/TestConnectionDialog.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/TestConnectionResultDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  resource details page rewrite


  Commit: ea50bf069942440dbe78032bde487e2d2c76638a
      https://github.com/Evolveum/midpoint/commit/ea50bf069942440dbe78032bde487e2d2c76638a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectSummaryPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectSummaryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/TestConnectionDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/TestConnectionDialog.java
    M gui/admin-gui/src/main/webapp/css/admin-lte/AdminLTE.min.css
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

  Log Message:
  -----------
  resource pages - summary panel


  Commit: 8df57e4f5b2f4bce6e5d171f589666a27bbe9f44
      https://github.com/Evolveum/midpoint/commit/8df57e4f5b2f4bce6e5d171f589666a27bbe9f44
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-01-22 (Fri, 22 Jan 2016)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeValuePanel.java
    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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/SimpleParametricRoleSelector.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/SimpleParametricRoleSelector.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/SimpleRoleSelector.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/SimpleRoleSelector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/MainPopupDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/GenericMultiValueLabelEditPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ListMultipleChoiceTransferPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ListMultipleChoiceTransferPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractFocusTabPanel.java
    A 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/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.html
    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/prism/H3Header.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/H3Header.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.html
    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/PrismPropertyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/StatisticsPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/sample/HelloFocusTabPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/sample/HelloFocusTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/sample/HelloObjectTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/sample/HelloObjectTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/sample/SampleFormFocusTabPanel.html
    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/SearchItemPanel.java
    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/wizard/resource/component/schemahandling/ResourceDependencyEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.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/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/EmptyOnBlurAjaxFormUpdatingBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/EmptyOnChangeAjaxFormUpdatingBehavior.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/NotificationConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.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/page/admin/users/PageAssignmentRequest.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageAssignmentRequest.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssociationValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/resource/img/ajax-loader.gif
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SearchResultList.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SearchResultMetadata.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/ClassPathUtil.java
    M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationCase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationDecision.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignmentReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RCertCaseReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RContainerReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointJoinedPersister.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidPointSingleTablePersister.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/MidpointPersisterUtil.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M samples/demo/PageLogin.html
    A samples/demo/aci.ldif
    M samples/demo/example-base-only.ldif
    M samples/demo/groups.ldif
    A samples/demo/library.ldif
    A samples/demo/openldap.xml
    M samples/demo/org.xml
    M samples/demo/orgs.ldif
    M samples/demo/projects-metaRole.xml
    M samples/demo/projects.ldif
    M samples/demo/role-fte.xml
    A samples/resources/scriptedrest/confluence-wiki/CreateScript.groovy
    A samples/resources/scriptedrest/confluence-wiki/DeleteScript.groovy
    A samples/resources/scriptedrest/confluence-wiki/SchemaScript.groovy
    A samples/resources/scriptedrest/confluence-wiki/SearchScript.groovy
    A samples/resources/scriptedrest/confluence-wiki/TestScript.groovy
    A samples/resources/scriptedrest/confluence-wiki/UpdateScript.groovy
    A samples/resources/scriptedrest/confluence-wiki/default.png
    A samples/resources/scriptedrest/confluence-wiki/resource.xml
    A samples/resources/scriptedrest/jira/CreateScript.groovy
    A samples/resources/scriptedrest/jira/DeleteScript.groovy
    A samples/resources/scriptedrest/jira/SchemaScript.groovy
    A samples/resources/scriptedrest/jira/SearchScript.groovy
    A samples/resources/scriptedrest/jira/TestScript.groovy
    A samples/resources/scriptedrest/jira/UpdateScript.groovy
    A samples/resources/scriptedrest/jira/resource.xml
    A samples/rest/modification-change-password.xml
    M samples/roles/role-basic-user.xml
    A samples/roles/role-domain-admin.xml
    A samples/roles/role-domain-auditor.xml
    A samples/roles/role-domain-operator.xml
    A samples/schema/extension-samples.xsd
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/consistency-mechanism/src/test/resources/repo/task-derby-reconciliation.xml
    M testing/consistency-mechanism/src/test/resources/repo/task-opendj-reconciliation.xml
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/account/ResourceUserAccountTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/basictests/RoleTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/organization/OrganizationStructureTests.java
    A tools/generate-midpoint-users-xml-example-template.xml
    A tools/generate-midpoint-users-xml.pl

  Log Message:
  -----------
  Merge branch 'master' into feature/resource-pages

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java


  Commit: f91ee726f74cac6f126715a9a8960a4106460973
      https://github.com/Evolveum/midpoint/commit/f91ee726f74cac6f126715a9a8960a4106460973
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-01-22 (Fri, 22 Jan 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java

  Log Message:
  -----------
  resolved conflicts after merge


Compare: https://github.com/Evolveum/midpoint/compare/ab6b7da2a804...f91ee726f74c

More information about the midPoint-svn mailing list