[midPoint-git] [Evolveum/midpoint] 2f6545: assignment focus type fix

[Viliam Repan]

  Branch: refs/heads/feature/ninja-upgrade
  Home:   https://github.com/Evolveum/midpoint
  Commit: 2f65451ecc4cb6623b8a3e7b816f3d53703a988a
      https://github.com/Evolveum/midpoint/commit/2f65451ecc4cb6623b8a3e7b816f3d53703a988a
  Author: kate <honchar at evolveum.com>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Log Message:
  -----------
  assignment focus type fix


  Commit: b96f231f75acc2453a5ff2c18ff0fbdeb141d657
      https://github.com/Evolveum/midpoint/commit/b96f231f75acc2453a5ff2c18ff0fbdeb141d657
  Author: kate <honchar at evolveum.com>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

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

  Log Message:
  -----------
  assignment focus type fix

# Conflicts:
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java


  Commit: 2c1f9b32dbf5797171db619a897c4ddbb96cb637
      https://github.com/Evolveum/midpoint/commit/2c1f9b32dbf5797171db619a897c4ddbb96cb637
  Author: kate <honchar at evolveum.com>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

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

  Log Message:
  -----------
  focus type field small change


  Commit: 1ed397975f9b97e14789ed26dc79378090878166
      https://github.com/Evolveum/midpoint/commit/1ed397975f9b97e14789ed26dc79378090878166
  Author: kate <honchar at evolveum.com>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

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

  Log Message:
  -----------
  added user type for focus type field


  Commit: 1df07c96100335101dc667f167133961b9951408
      https://github.com/Evolveum/midpoint/commit/1df07c96100335101dc667f167133961b9951408
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/resources/ctx-configuration-sql-test.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/CacheDispatcherImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryBeanConfig.java

  Log Message:
  -----------
  repository tests fix. spring contexts/configuration cleanup really needed


  Commit: 40249a4e7fd0f4b75ca20b0acf1d1069e1375ace
      https://github.com/Evolveum/midpoint/commit/40249a4e7fd0f4b75ca20b0acf1d1069e1375ace
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

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

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


  Commit: 7fbcc9f571665d387c3462163f0fde9938ef2ab9
      https://github.com/Evolveum/midpoint/commit/7fbcc9f571665d387c3462163f0fde9938ef2ab9
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-test.xml
    M repo/repo-sql-impl-test/src/test/resources/ctx-configuration-sql-test.xml

  Log Message:
  -----------
  repository tests fix. spring contexts/configuration cleanup really needed


  Commit: 19cdfe37243c723cc6f3a606aa7cc9bfc7ac22bd
      https://github.com/Evolveum/midpoint/commit/19cdfe37243c723cc6f3a606aa7cc9bfc7ac22bd
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
    M repo/repo-test-util/src/main/resources/ctx-configuration-test-no-repo.xml

  Log Message:
  -----------
  repository tests fix. spring contexts/configuration cleanup really needed


  Commit: 716703f27def382f78ecc44dea206ee3848ceadb
      https://github.com/Evolveum/midpoint/commit/716703f27def382f78ecc44dea206ee3848ceadb
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-03-17 (Sat, 17 Mar 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameObjectTypeChoiceRenderer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-test.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/CacheDispatcherImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryBeanConfig.java
    M repo/repo-test-util/src/main/resources/ctx-configuration-test-no-repo.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/ninja-upgrade


Compare: https://github.com/Evolveum/midpoint/compare/38b61ac3d5fb...716703f27def