[midPoint-git] [Evolveum/midpoint] e40e02: Fix for master (after cherry-pick), enabling the t...

[Radovan Semancik]

  Branch: refs/heads/feature/sod
  Home:   https://github.com/Evolveum/midpoint
  Commit: e40e020876804d9d51adaa87cada67561ecfa4b2
      https://github.com/Evolveum/midpoint/commit/e40e020876804d9d51adaa87cada67561ecfa4b2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java

  Log Message:
  -----------
  Fix for master (after cherry-pick), enabling the two disabled tests and fixing them (MID-3683)


  Commit: 2a8e196bc533407252cae7ad6c6846fa01b6eade
      https://github.com/Evolveum/midpoint/commit/2a8e196bc533407252cae7ad6c6846fa01b6eade
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html

  Log Message:
  -----------
  little code cleanup


  Commit: f489c067e603f88b18435aba10cd87f74300bceb
      https://github.com/Evolveum/midpoint/commit/f489c067e603f88b18435aba10cd87f74300bceb
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java

  Log Message:
  -----------
  some code refactoring


  Commit: 7f9e69773146871524e3a87a8012a1a99e3002dd
      https://github.com/Evolveum/midpoint/commit/7f9e69773146871524e3a87a8012a1a99e3002dd
  Author: honchar <honchar at evolveum.com>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java

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


  Commit: a29de538d3efe4ea2daaeb70168cc0200f0a8174
      https://github.com/Evolveum/midpoint/commit/a29de538d3efe4ea2daaeb70168cc0200f0a8174
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java

  Log Message:
  -----------
  Merge branch 'master' into feature/sod


Compare: https://github.com/Evolveum/midpoint/compare/2c0bfe835f86...a29de538d3ef