[midPoint-git] [Evolveum/midpoint] 5016eb: DB scripts for 3.4 release

Petr Gašparík petr.gasparik at ami.cz
Thu Jun 23 11:39:01 CEST 2016


  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: 5016ebfd98b2242ac7593b8e4550507ac6a80bbe
      https://github.com/Evolveum/midpoint/commit/5016ebfd98b2242ac7593b8e4550507ac6a80bbe
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M config/initial-objects/020-system-configuration.xml
    M config/initial-objects/040-role-enduser.xml
    A config/initial-objects/041-role-approver.xml
    A config/initial-objects/042-role-reviewer.xml
    A config/initial-objects/120-security-policy.xml
    A config/initial-objects/130-report-certification-definitions.xml
    A config/initial-objects/140-report-certification-campaigns.xml
    A config/initial-objects/150-report-certification-cases.xml
    A config/initial-objects/160-report-certification-decisions.xml
    A config/initial-objects/200-lookup-languages.xml
    A config/initial-objects/210-lookup-locales.xml
    A config/initial-objects/220-lookup-timezones.xml
    R config/sql/_all/h2-3.3-all.sql
    A config/sql/_all/h2-3.4-all.sql
    R config/sql/_all/h2-upgrade-3.2-3.3.sql
    A config/sql/_all/h2-upgrade-3.3-3.4.sql
    R config/sql/_all/mysql-3.3-all.sql
    A config/sql/_all/mysql-3.4-all.sql
    R config/sql/_all/mysql-upgrade-3.2-3.3.sql
    A config/sql/_all/mysql-upgrade-3.3-3.4.sql
    R config/sql/_all/oracle-3.3-all.sql
    A config/sql/_all/oracle-3.4-all.sql
    R config/sql/_all/oracle-upgrade-3.2-3.3.sql
    A config/sql/_all/oracle-upgrade-3.3-3.4.sql
    R config/sql/_all/postgresql-3.3-all.sql
    A config/sql/_all/postgresql-3.4-all.sql
    R config/sql/_all/postgresql-upgrade-3.2-3.3.sql
    A config/sql/_all/postgresql-upgrade-3.3-3.4.sql
    R config/sql/_all/sqlserver-3.3-all.sql
    A config/sql/_all/sqlserver-3.4-all.sql
    R config/sql/_all/sqlserver-upgrade-3.2-3.3.sql
    A config/sql/_all/sqlserver-upgrade-3.3-3.4.sql
    M config/sql/activiti/activiti.h2.create.engine.sql
    M config/sql/activiti/activiti.h2.create.history.sql
    M config/sql/activiti/activiti.mssql.create.engine.sql
    M config/sql/activiti/activiti.mssql.create.history.sql
    M config/sql/activiti/activiti.mysql.create.engine.sql
    M config/sql/activiti/activiti.mysql.create.history.sql
    M config/sql/activiti/activiti.oracle.create.engine.sql
    M config/sql/activiti/activiti.oracle.create.history.sql
    M config/sql/activiti/activiti.postgres.create.engine.sql
    M config/sql/activiti/activiti.postgres.create.history.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT.sql

  Log Message:
  -----------
  DB scripts for 3.4 release


  Commit: d34b4cd0190660407a3a3e015e0fada00e9930b8
      https://github.com/Evolveum/midpoint/commit/d34b4cd0190660407a3a3e015e0fada00e9930b8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    A gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties
    A infra/schema/src/main/resources/localization/schema_ar.properties
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_es_AR.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_hi.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.properties

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 2ecb4c351f19df14249f72e59539cbcbda492a61
      https://github.com/Evolveum/midpoint/commit/2ecb4c351f19df14249f72e59539cbcbda492a61
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M config/initial-objects/200-lookup-languages.xml
    M config/initial-objects/210-lookup-locales.xml

  Log Message:
  -----------
  Updated config/initial-objects once again.


  Commit: efedb3486f4cc29f74cf06da9dfaae71cb975550
      https://github.com/Evolveum/midpoint/commit/efedb3486f4cc29f74cf06da9dfaae71cb975550
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java

  Log Message:
  -----------
  PageRequestRole: "reloading the page after save" is fixed


  Commit: d0b542b56417e9113884abb8f276ee86e214a642
      https://github.com/Evolveum/midpoint/commit/d0b542b56417e9113884abb8f276ee86e214a642
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M config/initial-objects/020-system-configuration.xml
    M config/initial-objects/040-role-enduser.xml
    A config/initial-objects/041-role-approver.xml
    A config/initial-objects/042-role-reviewer.xml
    A config/initial-objects/120-security-policy.xml
    A config/initial-objects/130-report-certification-definitions.xml
    A config/initial-objects/140-report-certification-campaigns.xml
    A config/initial-objects/150-report-certification-cases.xml
    A config/initial-objects/160-report-certification-decisions.xml
    A config/initial-objects/200-lookup-languages.xml
    A config/initial-objects/210-lookup-locales.xml
    A config/initial-objects/220-lookup-timezones.xml
    R config/sql/_all/h2-3.3-all.sql
    A config/sql/_all/h2-3.4-all.sql
    R config/sql/_all/h2-upgrade-3.2-3.3.sql
    A config/sql/_all/h2-upgrade-3.3-3.4.sql
    R config/sql/_all/mysql-3.3-all.sql
    A config/sql/_all/mysql-3.4-all.sql
    R config/sql/_all/mysql-upgrade-3.2-3.3.sql
    A config/sql/_all/mysql-upgrade-3.3-3.4.sql
    R config/sql/_all/oracle-3.3-all.sql
    A config/sql/_all/oracle-3.4-all.sql
    R config/sql/_all/oracle-upgrade-3.2-3.3.sql
    A config/sql/_all/oracle-upgrade-3.3-3.4.sql
    R config/sql/_all/postgresql-3.3-all.sql
    A config/sql/_all/postgresql-3.4-all.sql
    R config/sql/_all/postgresql-upgrade-3.2-3.3.sql
    A config/sql/_all/postgresql-upgrade-3.3-3.4.sql
    R config/sql/_all/sqlserver-3.3-all.sql
    A config/sql/_all/sqlserver-3.4-all.sql
    R config/sql/_all/sqlserver-upgrade-3.2-3.3.sql
    A config/sql/_all/sqlserver-upgrade-3.3-3.4.sql
    M config/sql/activiti/activiti.h2.create.engine.sql
    M config/sql/activiti/activiti.h2.create.history.sql
    M config/sql/activiti/activiti.mssql.create.engine.sql
    M config/sql/activiti/activiti.mssql.create.history.sql
    M config/sql/activiti/activiti.mysql.create.engine.sql
    M config/sql/activiti/activiti.mysql.create.history.sql
    M config/sql/activiti/activiti.oracle.create.engine.sql
    M config/sql/activiti/activiti.oracle.create.history.sql
    M config/sql/activiti/activiti.postgres.create.engine.sql
    M config/sql/activiti/activiti.postgres.create.history.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/ModelInitialSetup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.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
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ExpressionEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SearchFilterPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/dto/ExpressionTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.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/prism/ContainerWrapperFactory.java
    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.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.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/progress/ProgressReporter.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/wizard/resource/component/schemahandling/AttributeEditorUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/PrismPropertyRealValueFromContainerableModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/PrismPropertyRealValueFromObjectWrapperModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/PrismPropertyRealValueFromPrismObjectModel.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/certification/PageCertCampaign.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.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/certification/PageCertDefinitions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.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/PageImportObject.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepoQuery.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectSelectionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.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/ResourceDetailsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.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/roles/RoleMemberPanel.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
    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/NodeDtoProvider.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/handlers/ResourceRelatedHandlerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/dto/ResourceRelatedHandlerDto.java
    M 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/DefaultGuiProgressListener.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.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/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.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/forgetpassword/PageForgetPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.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/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
    M gui/admin-gui/src/main/resources/initial-objects/041-role-approver.xml
    A gui/admin-gui/src/main/resources/initial-objects/042-role-reviewer.xml
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    A gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties
    A infra/schema/src/main/resources/localization/schema_ar.properties
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_es_AR.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_hi.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.properties
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertResponseComputationHelper.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/visualizer/Name.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/visualizer/Visualizer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/output/NameImpl.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java

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


  Commit: 38fe6c06b3ec5002291d5199e973c8969cd462ee
      https://github.com/Evolveum/midpoint/commit/38fe6c06b3ec5002291d5199e973c8969cd462ee
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java

  Log Message:
  -----------
  Default activitiSchemaUpdate is driven by hibernateHbm2ddl setting.


  Commit: 2ac62ff0eca363f1ae61bd3a8181928b0ed79a2f
      https://github.com/Evolveum/midpoint/commit/2ac62ff0eca363f1ae61bd3a8181928b0ed79a2f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 96d2c8b0ef6ad57ba8743317a4e22de1f71f3984
      https://github.com/Evolveum/midpoint/commit/96d2c8b0ef6ad57ba8743317a4e22de1f71f3984
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java

  Log Message:
  -----------
  PageRequestRole: unassign button enable status is set with authorization


  Commit: a13237574aa6edbcabdba3e28a59cc45f238b1e9
      https://github.com/Evolveum/midpoint/commit/a13237574aa6edbcabdba3e28a59cc45f238b1e9
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java

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


  Commit: 19b55c6a9706b6858a3b8f72b0e09d19a8011424
      https://github.com/Evolveum/midpoint/commit/19b55c6a9706b6858a3b8f72b0e09d19a8011424
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.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/ObjectWrapperFactory.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    A gui/admin-gui/src/test/resources/wrapper/role-prop-read-all-modify-some-user.xml
    A gui/admin-gui/src/test/resources/wrapper/role-prop-read-some-modify-some-user.xml
    R gui/admin-gui/src/test/resources/wrapper/user.xml

  Log Message:
  -----------
  Fixing handling of readonly flag in wrappers (MID-3126) +tests +interface comments


  Commit: 6d1efe39f608c31ac8a0ae9abc8cfc9ca54a9e01
      https://github.com/Evolveum/midpoint/commit/6d1efe39f608c31ac8a0ae9abc8cfc9ca54a9e01
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M config/initial-objects/020-system-configuration.xml
    M config/initial-objects/040-role-enduser.xml
    A config/initial-objects/041-role-approver.xml
    A config/initial-objects/042-role-reviewer.xml
    A config/initial-objects/120-security-policy.xml
    A config/initial-objects/130-report-certification-definitions.xml
    A config/initial-objects/140-report-certification-campaigns.xml
    A config/initial-objects/150-report-certification-cases.xml
    A config/initial-objects/160-report-certification-decisions.xml
    A config/initial-objects/200-lookup-languages.xml
    A config/initial-objects/210-lookup-locales.xml
    A config/initial-objects/220-lookup-timezones.xml
    R config/sql/_all/h2-3.3-all.sql
    A config/sql/_all/h2-3.4-all.sql
    R config/sql/_all/h2-upgrade-3.2-3.3.sql
    A config/sql/_all/h2-upgrade-3.3-3.4.sql
    R config/sql/_all/mysql-3.3-all.sql
    A config/sql/_all/mysql-3.4-all.sql
    R config/sql/_all/mysql-upgrade-3.2-3.3.sql
    A config/sql/_all/mysql-upgrade-3.3-3.4.sql
    R config/sql/_all/oracle-3.3-all.sql
    A config/sql/_all/oracle-3.4-all.sql
    R config/sql/_all/oracle-upgrade-3.2-3.3.sql
    A config/sql/_all/oracle-upgrade-3.3-3.4.sql
    R config/sql/_all/postgresql-3.3-all.sql
    A config/sql/_all/postgresql-3.4-all.sql
    R config/sql/_all/postgresql-upgrade-3.2-3.3.sql
    A config/sql/_all/postgresql-upgrade-3.3-3.4.sql
    R config/sql/_all/sqlserver-3.3-all.sql
    A config/sql/_all/sqlserver-3.4-all.sql
    R config/sql/_all/sqlserver-upgrade-3.2-3.3.sql
    A config/sql/_all/sqlserver-upgrade-3.3-3.4.sql
    M config/sql/activiti/activiti.h2.create.engine.sql
    M config/sql/activiti/activiti.h2.create.history.sql
    M config/sql/activiti/activiti.mssql.create.engine.sql
    M config/sql/activiti/activiti.mssql.create.history.sql
    M config/sql/activiti/activiti.mysql.create.engine.sql
    M config/sql/activiti/activiti.mysql.create.history.sql
    M config/sql/activiti/activiti.oracle.create.engine.sql
    M config/sql/activiti/activiti.oracle.create.history.sql
    M config/sql/activiti/activiti.postgres.create.engine.sql
    M config/sql/activiti/activiti.postgres.create.history.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/h2/h2-upgrade-3.4-SNAPSHOT.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/mysql/mysql-upgrade-3.4-SNAPSHOT.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/oracle/oracle-upgrade-3.4-SNAPSHOT.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.4-SNAPSHOT.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-2.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-3.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-4.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-5.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT-6.sql
    R config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.4-SNAPSHOT.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java

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


  Commit: e52fe959983bc8d83ce73ecbbbd26532f471755f
      https://github.com/Evolveum/midpoint/commit/e52fe959983bc8d83ce73ecbbbd26532f471755f
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/LockoutStatusPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  added info message after Lock-out status changing


  Commit: 320ab2c8fb0c57feedab46ac466d3d1ce4793aa7
      https://github.com/Evolveum/midpoint/commit/320ab2c8fb0c57feedab46ac466d3d1ce4793aa7
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.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/ObjectWrapperFactory.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    A gui/admin-gui/src/test/resources/wrapper/role-prop-read-all-modify-some-user.xml
    A gui/admin-gui/src/test/resources/wrapper/role-prop-read-some-modify-some-user.xml
    R gui/admin-gui/src/test/resources/wrapper/user.xml

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


  Commit: 8afe4cd102363257421e21e49356c872e835fcdc
      https://github.com/Evolveum/midpoint/commit/8afe4cd102363257421e21e49356c872e835fcdc
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.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/PrismPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractInitializedGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AdminGuiTestConstants.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    A gui/admin-gui/src/test/resources/common/user-empty.xml

  Log Message:
  -----------
  Fixing handling of emphasized properties vs definitions (MID-3206) +tests


  Commit: b1754c0931cda3af5eff0c48df9507c495d29e38
      https://github.com/Evolveum/midpoint/commit/b1754c0931cda3af5eff0c48df9507c495d29e38
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/MainPopupDialog.html

  Log Message:
  -----------
  small style fix


  Commit: f73d0224731d764b375d0f75fc7a1a3b3f33bb97
      https://github.com/Evolveum/midpoint/commit/f73d0224731d764b375d0f75fc7a1a3b3f33bb97
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    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/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java

  Log Message:
  -----------
  Fixing ui#all authorization (MID-3193)


  Commit: 51098dc160fab4421e14b59e43191e06140cd649
      https://github.com/Evolveum/midpoint/commit/51098dc160fab4421e14b59e43191e06140cd649
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  added property key for operation


  Commit: a226e5cdb62d3dc7581796dbb4eadd32a19078ac
      https://github.com/Evolveum/midpoint/commit/a226e5cdb62d3dc7581796dbb4eadd32a19078ac
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    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/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.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/PrismPropertyPanel.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/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractInitializedGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AdminGuiTestConstants.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    A gui/admin-gui/src/test/resources/common/user-empty.xml

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


  Commit: ccc9be62f29cab0cb13080e65c6c8e1c58a3e1fa
      https://github.com/Evolveum/midpoint/commit/ccc9be62f29cab0cb13080e65c6c8e1c58a3e1fa
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttribute.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java

  Log Message:
  -----------
  Fixing passing displayOrder in refined schema (MID-3144)


  Commit: 72610500f3bdbe56f3f5217c8bd580e497bc7f36
      https://github.com/Evolveum/midpoint/commit/72610500f3bdbe56f3f5217c8bd580e497bc7f36
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/AutoRefreshPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/RemovableAjaxTimerBehavior.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/PageTasks.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Hopefully fixed MID-3135: RekoncTask Edit GUI Exception


  Commit: c545e1fb6e97d641c5619a77bc3824b3247ca391
      https://github.com/Evolveum/midpoint/commit/c545e1fb6e97d641c5619a77bc3824b3247ca391
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    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/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/LockoutStatusPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/MainPopupDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.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/PrismPropertyPanel.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/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractInitializedGuiIntegrationTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AdminGuiTestConstants.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    A gui/admin-gui/src/test/resources/common/user-empty.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttribute.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'

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


  Commit: eea458a134ff60df1f6c2b4665e3c6a254632608
      https://github.com/Evolveum/midpoint/commit/eea458a134ff60df1f6c2b4665e3c6a254632608
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractInboundSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    A model/model-intest/src/test/resources/common/resource-dummy-emerald-deprecated.xml
    A model/model-intest/src/test/resources/common/resource-dummy-emerald.xml
    R model/model-intest/src/test/resources/sync/resource-dummy-emerald-deprecated.xml
    R model/model-intest/src/test/resources/sync/resource-dummy-emerald.xml

  Log Message:
  -----------
  Object template normal mapping tests (MID-3186) + some test refactoring


  Commit: 33dc52a21aed5e7ab8f2d3fe3dc2759708d1d394
      https://github.com/Evolveum/midpoint/commit/33dc52a21aed5e7ab8f2d3fe3dc2759708d1d394
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java

  Log Message:
  -----------
  Fixing provisioning test failures (sorry)


  Commit: 44379696645a5303f061787028fe69e3f227b172
      https://github.com/Evolveum/midpoint/commit/44379696645a5303f061787028fe69e3f227b172
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/AutoRefreshPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/RemovableAjaxTimerBehavior.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/PageTasks.java

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


  Commit: b23705b3bc37b745cfefc64f4297c2148cda9093
      https://github.com/Evolveum/midpoint/commit/b23705b3bc37b745cfefc64f4297c2148cda9093
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java

  Log Message:
  -----------
  Fixing displayOrder assert in TestModelServiceContract


  Commit: eb368bc7630d9aebf368246e8fada0d25cc29eb6
      https://github.com/Evolveum/midpoint/commit/eb368bc7630d9aebf368246e8fada0d25cc29eb6
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java

  Log Message:
  -----------
  Fixing displayOrder asserts in GUI tests


  Commit: 55bc7dd46790cb288e3971881f1b04b947cd8536
      https://github.com/Evolveum/midpoint/commit/55bc7dd46790cb288e3971881f1b04b947cd8536
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  unlock operation is fixed for List users page


  Commit: 14d5aa535972fbcc4629d065280fb46fa2d18dfc
      https://github.com/Evolveum/midpoint/commit/14d5aa535972fbcc4629d065280fb46fa2d18dfc
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/AutoRefreshPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/refresh/RemovableAjaxTimerBehavior.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/PageTasks.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttribute.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractInboundSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    A model/model-intest/src/test/resources/common/resource-dummy-emerald-deprecated.xml
    A model/model-intest/src/test/resources/common/resource-dummy-emerald.xml
    R model/model-intest/src/test/resources/sync/resource-dummy-emerald-deprecated.xml
    R model/model-intest/src/test/resources/sync/resource-dummy-emerald.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java

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


  Commit: 74d9c61672885deef1880504c18783b49881643e
      https://github.com/Evolveum/midpoint/commit/74d9c61672885deef1880504c18783b49881643e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertReviewersHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationRemediationTaskHandler.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java

  Log Message:
  -----------
  Fixed MID-3204: Unexpected targetRef type after "start campaign"


  Commit: cd04e0e7d20f5ae143471ef23795a86a08e6f262
      https://github.com/Evolveum/midpoint/commit/cd04e0e7d20f5ae143471ef23795a86a08e6f262
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: dac60eea048b69d964aebf7a8eb5d260c1c3aa48
      https://github.com/Evolveum/midpoint/commit/dac60eea048b69d964aebf7a8eb5d260c1c3aa48
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  RW: support for activation lockout capability


  Commit: 84c4a8e0c09a8df839e3513c06682056c0d68c65
      https://github.com/Evolveum/midpoint/commit/84c4a8e0c09a8df839e3513c06682056c0d68c65
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Implemented MID-3161: unlock in projections context menu


  Commit: 3f44d69a1e29d4d49f7bb339eac9e52d5c4eb51f
      https://github.com/Evolveum/midpoint/commit/3f44d69a1e29d4d49f7bb339eac9e52d5c4eb51f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java

  Log Message:
  -----------
  Fixed "Include target types" in certification definition (MID-3155 "d")


  Commit: 247bc682e35e896f8d522ec00a89a43cd8e26c9b
      https://github.com/Evolveum/midpoint/commit/247bc682e35e896f8d522ec00a89a43cd8e26c9b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java

  Log Message:
  -----------
  Fixed NPE in mail notification transport.


  Commit: 4d40563f0ebda93637cb6b0f06b7a75a050ab40a
      https://github.com/Evolveum/midpoint/commit/4d40563f0ebda93637cb6b0f06b7a75a050ab40a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M samples/evolveum/org-users.xml
    A samples/evolveum/roles.xml
    A samples/evolveum/security-policy.xml

  Log Message:
  -----------
  Improving Evolveum sample


  Commit: 1dead69ad52bf5ed921d689dcccf5147c24b534a
      https://github.com/Evolveum/midpoint/commit/1dead69ad52bf5ed921d689dcccf5147c24b534a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceWizardIssuesModel.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/validator/ResourceValidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/DataModelVisualizerImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/ResourceDataItem.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/VisualizationContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java

  Log Message:
  -----------
  RW: various fixes


  Commit: dfb30de429f49001095f502586c4d21c17ed7ca9
      https://github.com/Evolveum/midpoint/commit/dfb30de429f49001095f502586c4d21c17ed7ca9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M samples/evolveum/org-users.xml
    A samples/evolveum/roles.xml
    A samples/evolveum/security-policy.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 303437712f4fa70458a225eac7d996babec911f1
      https://github.com/Evolveum/midpoint/commit/303437712f4fa70458a225eac7d996babec911f1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java

  Log Message:
  -----------
  logging fix


  Commit: 08bf2c72934b7dce7f2459bc11f70b1f1d06bfd0
      https://github.com/Evolveum/midpoint/commit/08bf2c72934b7dce7f2459bc11f70b1f1d06bfd0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Fixed MID-3190: Confusing message when clicking Run now button


  Commit: 264c337c0164bcc7b099447644ddf88714932fc1
      https://github.com/Evolveum/midpoint/commit/264c337c0164bcc7b099447644ddf88714932fc1
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java

  Log Message:
  -----------
  some changes to Import object page


  Commit: f22ecb8a43d9c5bd07b4266948f97c7a8a26aa1d
      https://github.com/Evolveum/midpoint/commit/f22ecb8a43d9c5bd07b4266948f97c7a8a26aa1d
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    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/form/multivalue/MultiValueTextPanel.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/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionScopePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.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/resources/ResourceWizardIssuesModel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertReviewersHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationRemediationTaskHandler.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/validator/ResourceValidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/DataModelVisualizerImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/ResourceDataItem.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/VisualizationContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M samples/evolveum/org-users.xml
    A samples/evolveum/roles.xml
    A samples/evolveum/security-policy.xml

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


  Commit: 2de0bcc06eafaac67e58878d10f64f06812cceca
      https://github.com/Evolveum/midpoint/commit/2de0bcc06eafaac67e58878d10f64f06812cceca
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 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/page/forgetpassword/PageForgetPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/Producer.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipal.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java
    M samples/evolveum/security-policy.xml

  Log Message:
  -----------
  Fixing many issues in security questions pages. Support for more realiable privilege escalation. (MID-3166)


  Commit: 202a8cf928c617ac6f6c13c565b5efdd6ca38bce
      https://github.com/Evolveum/midpoint/commit/202a8cf928c617ac6f6c13c565b5efdd6ca38bce
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
    A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/TaskEvent.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationTaskListener.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationsUtil.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/AggregatedEventHandler.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleTaskNotifier.java

  Log Message:
  -----------
  Implemented MID-3188: Notify by e-mail when error occured to speed up reaction in production


  Commit: 52534abf3595b9c502c79c8e351120f89a5394fd
      https://github.com/Evolveum/midpoint/commit/52534abf3595b9c502c79c8e351120f89a5394fd
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 6e5a74f608cadb2c3feecd0f85ae632a5bc83680
      https://github.com/Evolveum/midpoint/commit/6e5a74f608cadb2c3feecd0f85ae632a5bc83680
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleTaskNotifier.java

  Log Message:
  -----------
  Added "run result status" to mail notifications.


  Commit: 624b1b46b46567cd76786fb0ecb81c328d230b6c
      https://github.com/Evolveum/midpoint/commit/624b1b46b46567cd76786fb0ecb81c328d230b6c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M infra/schema/src/main/resources/localization/schema.properties
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/validator/ResourceValidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DataModelUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java

  Log Message:
  -----------
  Fixed reporting of item path problems.


  Commit: 22f36a4d23b02d2de682402314f130daf561a9ec
      https://github.com/Evolveum/midpoint/commit/22f36a4d23b02d2de682402314f130daf561a9ec
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M infra/schema/src/main/resources/localization/schema.properties

  Log Message:
  -----------
  Minor correction.


  Commit: 0e2e4d9b4d92a8757488f1956a87c467c0cf6fa2
      https://github.com/Evolveum/midpoint/commit/0e2e4d9b4d92a8757488f1956a87c467c0cf6fa2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

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

  Log Message:
  -----------
  Fixed MID-3222: Capabilities buttons on PageResource show wrong information for 'component' capabilities


  Commit: e4519d09311d706aef5b4172409144b68fd057d7
      https://github.com/Evolveum/midpoint/commit/e4519d09311d706aef5b4172409144b68fd057d7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationManagerImpl.java

  Log Message:
  -----------
  Fixed yet another NPE in notifications.


  Commit: 41a34a1a56de1f2cc7a1427b61d71ee3c453d321
      https://github.com/Evolveum/midpoint/commit/41a34a1a56de1f2cc7a1427b61d71ee3c453d321
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M model/notifications-impl/pom.xml

  Log Message:
  -----------
  Fixing the build.


  Commit: cbbd4a84233ca07dfc77bfe0c153c93cd900693d
      https://github.com/Evolveum/midpoint/commit/cbbd4a84233ca07dfc77bfe0c153c93cd900693d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java

  Log Message:
  -----------
  Fixed MID-3195: deleting root org is redirected to list users


  Commit: afb9521fa70bd9409158610b2632de069aee467a
      https://github.com/Evolveum/midpoint/commit/afb9521fa70bd9409158610b2632de069aee467a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.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/users/component/TreeTablePanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/validator/ResourceValidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DataModelUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java
    A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/TaskEvent.java
    M model/notifications-impl/pom.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationManagerImpl.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationTaskListener.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationsUtil.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/AggregatedEventHandler.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleTaskNotifier.java

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


  Commit: e7de32f278716949ecf51c760b3150af37503e56
      https://github.com/Evolveum/midpoint/commit/e7de32f278716949ecf51c760b3150af37503e56
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  added property key


  Commit: 82127c2a07185a39ef9ad2dbbb5769ee99b243ad
      https://github.com/Evolveum/midpoint/commit/82127c2a07185a39ef9ad2dbbb5769ee99b243ad
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 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/wizard/resource/SynchronizationStep.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/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
    A infra/util/src/main/java/com/evolveum/midpoint/util/Producer.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/validator/ResourceValidator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DataModelUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/TaskEvent.java
    M model/notifications-impl/pom.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationManagerImpl.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationTaskListener.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationsUtil.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/AggregatedEventHandler.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleTaskNotifier.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipal.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java
    M samples/evolveum/security-policy.xml

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


  Commit: 8791155f753283b49e6430b08d08e9d286b9e974
      https://github.com/Evolveum/midpoint/commit/8791155f753283b49e6430b08d08e9d286b9e974
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M tools/repo-ninja/pom.xml

  Log Message:
  -----------
  Fixed MID-3215: Repo ninja is not working after removed AspectJ


  Commit: af7350c103c04a636ce278de2021cb775c2f4510
      https://github.com/Evolveum/midpoint/commit/af7350c103c04a636ce278de2021cb775c2f4510
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 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/page/forgetpassword/PageForgetPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    A infra/util/src/main/java/com/evolveum/midpoint/util/Producer.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipal.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java
    M samples/evolveum/security-policy.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 02a7e34e7ea8f1898b5559bb73f714a70998a127
      https://github.com/Evolveum/midpoint/commit/02a7e34e7ea8f1898b5559bb73f714a70998a127
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/AuthorizationActionValue.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/PageUrlMapping.java
    A gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestDescriptorLoader.java
    M gui/admin-gui/testng-unit.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java

  Log Message:
  -----------
  Fixing ui#all authorization (MID-3193), minor diag improvements


  Commit: d7bf2b0d9b956fe936b025aa2fa9fb7cb73de688
      https://github.com/Evolveum/midpoint/commit/d7bf2b0d9b956fe936b025aa2fa9fb7cb73de688
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M tools/repo-ninja/pom.xml

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


  Commit: 28e06d8e011323c2e6abed2090e7d21f37069465
      https://github.com/Evolveum/midpoint/commit/28e06d8e011323c2e6abed2090e7d21f37069465
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/FeedbackListView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.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/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/PersonalInfoPanel.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/ResourceContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionResultPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Resolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java

  Log Message:
  -----------
  First round of elimination of wicket warnings (e.g. MID-3225) + minor preview fix.


  Commit: 8dff68e945d02d3e359f7a72b3de38bbe7742eae
      https://github.com/Evolveum/midpoint/commit/8dff68e945d02d3e359f7a72b3de38bbe7742eae
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/AuthorizationActionValue.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/PageUrlMapping.java
    A gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestDescriptorLoader.java
    M gui/admin-gui/testng-unit.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: c7ab410eaa00b43665ea40dfd6dbb673adb4e5e5
      https://github.com/Evolveum/midpoint/commit/c7ab410eaa00b43665ea40dfd6dbb673adb4e5e5
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java

  Log Message:
  -----------
  Request a role page: added filter to query to speed up query processing


  Commit: ae168cd82392b0eceab09b7b4af6c05a269e9223
      https://github.com/Evolveum/midpoint/commit/ae168cd82392b0eceab09b7b4af6c05a269e9223
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/AuthorizationActionValue.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/FeedbackListView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.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/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/PersonalInfoPanel.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/ResourceContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionResultPanel.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/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/PageUrlMapping.java
    A gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestDescriptorLoader.java
    M gui/admin-gui/testng-unit.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Resolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
    M tools/repo-ninja/pom.xml

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


  Commit: 4aa0fbd5102889ce90ff252d26592e3e72b42b42
      https://github.com/Evolveum/midpoint/commit/4aa0fbd5102889ce90ff252d26592e3e72b42b42
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 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/data/column/LinkColumn.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ObjectLinkColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java

  Log Message:
  -----------
  Fixing shadow owner links (MID-3217)


  Commit: 7dff457fd8820ecd6668d27ae93ab2ae153bbf26
      https://github.com/Evolveum/midpoint/commit/7dff457fd8820ecd6668d27ae93ab2ae153bbf26
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/FeedbackListView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.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/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/PersonalInfoPanel.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/ResourceContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionResultPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskResultTabPanel.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Resolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java

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


  Commit: b2eebf9244151a2c763b20b09fb0779989326239
      https://github.com/Evolveum/midpoint/commit/b2eebf9244151a2c763b20b09fb0779989326239
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java

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


  Commit: 895e9fdc015c065f8d0b26efc527c8699306531d
      https://github.com/Evolveum/midpoint/commit/895e9fdc015c065f8d0b26efc527c8699306531d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java

  Log Message:
  -----------
  MID-3225: Fixing "Tried to retrieve a localized string ..." for MultipleAssignmentSelector


  Commit: 4757f7f0cb863359b6e9bb4868983c1c7feaca75
      https://github.com/Evolveum/midpoint/commit/4757f7f0cb863359b6e9bb4868983c1c7feaca75
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 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/assignment/MultipleAssignmentSelector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/LinkColumn.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ObjectLinkColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java

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


  Commit: 2da25aa6be437130d7bea2dc075949ffbe23fe21
      https://github.com/Evolveum/midpoint/commit/2da25aa6be437130d7bea2dc075949ffbe23fe21
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/info-box.less
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

  Log Message:
  -----------
  Fixing summary box styles


  Commit: 4ccd228f71301532e4a46cdb12c2614ed9c676ac
      https://github.com/Evolveum/midpoint/commit/4ccd228f71301532e4a46cdb12c2614ed9c676ac
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java

  Log Message:
  -----------
  Self dashboard page: search by enter key press is fixed


  Commit: e063c98463408105f8e53f98871e2d072e49d237
      https://github.com/Evolveum/midpoint/commit/e063c98463408105f8e53f98871e2d072e49d237
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 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/data/column/LinkColumn.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ObjectLinkColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/info-box.less
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

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


  Commit: 9ca01a809d3bb62be21f6a349ee62ed4e9f8744e
      https://github.com/Evolveum/midpoint/commit/9ca01a809d3bb62be21f6a349ee62ed4e9f8744e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java

  Log Message:
  -----------
  Removed NodeType from "assign member" choosers (MID-3207).


  Commit: 96c2c7f6851697b117b089cc97bae3392cdc8226
      https://github.com/Evolveum/midpoint/commit/96c2c7f6851697b117b089cc97bae3392cdc8226
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/info-box.less
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 0f03bf2282a3bbfaa54bea17dbe28732944abcb0
      https://github.com/Evolveum/midpoint/commit/0f03bf2282a3bbfaa54bea17dbe28732944abcb0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/CheckingProgressListener.java

  Log Message:
  -----------
  Test for model context sanity in progess listener (MID-3213)


  Commit: 906f779fe04179155477399b2653048ef6ba0ef0
      https://github.com/Evolveum/midpoint/commit/906f779fe04179155477399b2653048ef6ba0ef0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java

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


  Commit: 9e34b56db51a55828484c32679780e5652850591
      https://github.com/Evolveum/midpoint/commit/9e34b56db51a55828484c32679780e5652850591
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  added title to user icons on Users list page


  Commit: a744e085e1a9e9d262e36ed64187a58f55826299
      https://github.com/Evolveum/midpoint/commit/a744e085e1a9e9d262e36ed64187a58f55826299
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/CheckingProgressListener.java

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


  Commit: dcb1470449ac20b183bc2ef0fc1c0cce71c11484
      https://github.com/Evolveum/midpoint/commit/dcb1470449ac20b183bc2ef0fc1c0cce71c11484
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java
    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/component/PopupObjectListPanel.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/form/ValueChoosePanel.java
    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.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java

  Log Message:
  -----------
  Fixhack for user/org properties such as approverRef (MID-3201)


  Commit: 3a576427560920f5a6f777b42ce262de9edf6364
      https://github.com/Evolveum/midpoint/commit/3a576427560920f5a6f777b42ce262de9edf6364
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java
    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/component/PopupObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.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/page/admin/resources/ResourceContentPanel.java

  Log Message:
  -----------
  Fixing previous fixes (MID-3217, MID-3201)


  Commit: 903dc492119cca18ee05fccbde480a82822eda59
      https://github.com/Evolveum/midpoint/commit/903dc492119cca18ee05fccbde480a82822eda59
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java

  Log Message:
  -----------
  fix for lookup table field


  Commit: 336d883c2811aece1cbecedc01c4420cd4716ba8
      https://github.com/Evolveum/midpoint/commit/336d883c2811aece1cbecedc01c4420cd4716ba8
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java
    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/component/PopupObjectListPanel.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/data/SelectableBeanObjectDataProvider.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/form/ValueChoosePanel.java
    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.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java

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


  Commit: 28ad3c837b7e448a6278123d1b39f749141c2e3b
      https://github.com/Evolveum/midpoint/commit/28ad3c837b7e448a6278123d1b39f749141c2e3b
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java

  Log Message:
  -----------
  removed limit of displayable values for lockup table


  Commit: d19f56ea48104aa3de16cf4902e9319c7fe24472
      https://github.com/Evolveum/midpoint/commit/d19f56ea48104aa3de16cf4902e9319c7fe24472
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    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/ResourceDetailsTabPanel.java

  Log Message:
  -----------
  Fixing wrong invocaiton of getString() (MID-3225)


  Commit: b2471f6a555871319cf36eb692bfd2f58fa77506
      https://github.com/Evolveum/midpoint/commit/b2471f6a555871319cf36eb692bfd2f58fa77506
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M samples/evolveum/roles.xml

  Log Message:
  -----------
  Fixing regression with parentOrgRef and security (also see MID-3234 and MID-3233)


  Commit: 3805729df5f5b8a2b19fe97e71de8b692c71070d
      https://github.com/Evolveum/midpoint/commit/3805729df5f5b8a2b19fe97e71de8b692c71070d
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java

  Log Message:
  -----------
  request a role page: fixed InOidFilter for query


  Commit: 2f69aed704dba80086fafed40aafcf23251a5ab5
      https://github.com/Evolveum/midpoint/commit/2f69aed704dba80086fafed40aafcf23251a5ab5
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    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/ResourceDetailsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M samples/evolveum/roles.xml

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


  Commit: 36b81e39c1a691ed4c87a9f1ed65fab933b9c4eb
      https://github.com/Evolveum/midpoint/commit/36b81e39c1a691ed4c87a9f1ed65fab933b9c4eb
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RequestAssignmentTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java

  Log Message:
  -----------
  Fixing previous fix for MID-3225 "Tried to retrieve a localized string ..." for MultipleAssignmentSelector


  Commit: c71ef80360412f9c9350bea0dacd77f26d3394aa
      https://github.com/Evolveum/midpoint/commit/c71ef80360412f9c9350bea0dacd77f26d3394aa
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java
    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/component/PopupObjectListPanel.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/assignment/MultipleAssignmentSelector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.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/form/ValueChoosePanel.java
    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.java
    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/ResourceContentPanel.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/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/info-box.less
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/CheckingProgressListener.java
    M samples/evolveum/roles.xml

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


  Commit: b385dfb21af08ab7bb18f224c617b49c589b3106
      https://github.com/Evolveum/midpoint/commit/b385dfb21af08ab7bb18f224c617b49c589b3106
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java

  Log Message:
  -----------
  Workaround for MID-3207: excluding ShadowType from "Assign member" function


  Commit: 4cd556ce4d3db7afef08431e0db383a4b18ee2e6
      https://github.com/Evolveum/midpoint/commit/4cd556ce4d3db7afef08431e0db383a4b18ee2e6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListComponent.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.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/services/PageServices.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Implemented MID-3203: Enable, Disable in List Roles and List Services


  Commit: 4578a3f8e4aaa46decba83cfe0e455569731e59a
      https://github.com/Evolveum/midpoint/commit/4578a3f8e4aaa46decba83cfe0e455569731e59a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java

  Log Message:
  -----------
  Fixed "not serializable" exception related to roles/services (MID-3239).


  Commit: cd07f2651bb6181b237cd0a471ad0538576bb351
      https://github.com/Evolveum/midpoint/commit/cd07f2651bb6181b237cd0a471ad0538576bb351
  Author: Ramón Cahenzli <rca at psy-q.ch>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties

  Log Message:
  -----------
  Fix the spelling of XML


  Commit: d2474f3f0159d8998035883ee5976829092a053d
      https://github.com/Evolveum/midpoint/commit/d2474f3f0159d8998035883ee5976829092a053d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.java

  Log Message:
  -----------
  MID-3212 breadcrumbs fixed on security questions pages


  Commit: 59920fd8dc1c01c151301b7dc2a693fd92f73961
      https://github.com/Evolveum/midpoint/commit/59920fd8dc1c01c151301b7dc2a693fd92f73961
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties

  Log Message:
  -----------
  Merge pull request #9 from psy-q/fix/xml_spelling

Fix the spelling of XML in the GUI


  Commit: 982635eb9697612eb7c4fd94dc318998f5a9a596
      https://github.com/Evolveum/midpoint/commit/982635eb9697612eb7c4fd94dc318998f5a9a596
  Author: Petr Gašparík <petr.gasparik at ami.cz>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M infra/schema/src/main/resources/localization/schema_ar.properties
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_es_AR.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_hi.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.properties

  Log Message:
  -----------
  Translation of texts for midPoint version 3.4
Thanks to all contributors on transifex!
Namely, users (in alphabetical order): AivoK (ee), ardanu (tr), markus.steiner (de), petr.gasparik (cz)


Compare: https://github.com/Evolveum/midpoint/compare/30152e1733fa...982635eb9697


More information about the midPoint-svn mailing list