[midPoint-git] [Evolveum/midpoint] 726105: Hopefully fixed MID-3135: RekoncTask Edit GUI Exce...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  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


Compare: https://github.com/Evolveum/midpoint/compare/ccc9be62f29c...c545e1fb6e97