[midPoint-git] [Evolveum/midpoint] 11e0ea: improvements for deployment information is applied...

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 11e0eacaec1a81246841365d18edd1f7142dc8cd
      https://github.com/Evolveum/midpoint/commit/11e0eacaec1a81246841365d18edd1f7142dc8cd
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java

  Log Message:
  -----------
  improvements for deployment information is applied in GUI: header color, logo, application name


  Commit: 760b2394a7d6575adc3072be9f5bc8beeca35f82
      https://github.com/Evolveum/midpoint/commit/760b2394a7d6575adc3072be9f5bc8beeca35f82
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardButtonBar.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.java
    M infra/schema/src/main/resources/META-INF/schemas-in-this-module.xml
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    A infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M model/model-client/src/compile/resources/jax-ws-catalog.xml
    M model/model-client/src/main/resources/META-INF/jax-ws-catalog.xml
    M model/model-common/pom.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
    M model/model-common/src/test/resources/mapping/mapping-script-transform.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/model-impl/src/test/resources/lens/role-judge.xml
    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/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/resources/object-template-ranges/user-template-ranges.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
    M model/workflow-impl/src/test/resources/policy/metarole-default.xml
    M model/workflow-impl/src/test/resources/policy/metarole-security.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-form.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/02168a073716...760b2394a7d6