[midPoint-git] midPoint branch bootstrap updated. v2.3devel-299-g7000813

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  700081343e9f861b45a22f2bf86da45bed72fd6e (commit) v2.3devel-299-g7000813
       via  a8161e36662fe830a714f62c03e9fb32ca64cde6 (commit) v2.3devel-155-ga8161e3
       via  3b30b0407c13f604643e7d7acf849be0d0f1ad75 (commit) v2.3devel-297-g3b30b04
       via  519448f10f407e77478c71d3ac810daa566b13bf (commit) v2.3devel-296-g519448f
       via  5d9c66649ca14d013286a366d9d08ab9db77b087 (commit) v2.3devel-295-g5d9c666
       via  c05160d19dbad186505244a16748ba4326416f0b (commit) v2.3devel-294-gc05160d
      from  736f3d5cff28e074038f56fa845e6f93b0a44c01 (commit) v2.3devel-293-g736f3d5

- Log -----------------------------------------------------------------
commit 700081343e9f861b45a22f2bf86da45bed72fd6e
Merge: 3b30b04 a8161e3
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Oct 29 15:52:04 2013 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap

commit 3b30b0407c13f604643e7d7acf849be0d0f1ad75
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Oct 29 15:44:28 2013 +0100

    wizard steps now shows current step correctly.

commit 519448f10f407e77478c71d3ac810daa566b13bf
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Oct 29 15:42:54 2013 +0100

    removed unused code from user details page (PREVIEW).

commit 5d9c66649ca14d013286a366d9d08ab9db77b087
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Oct 29 15:30:02 2013 +0100

    user details, removed all obsolete buttons

commit c05160d19dbad186505244a16748ba4326416f0b
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Oct 29 13:07:34 2013 +0100

    inline menu for accounts.

-----------------------------------------------------------------------

(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)

Summary of changes:
 .../web/component/menu/cog/InlineMenu.java         |    9 +-
 .../web/component/prism/CheckTableHeader.java      |    2 +-
 .../midpoint/web/component/wizard/Wizard.java      |   17 +
 .../wizard/resource/ConfigurationStep.properties   |    1 +
 .../web/component/wizard/resource/NameStep.java    |    9 +-
 .../midpoint/web/page/admin/users/PageUser.html    |   21 +-
 .../midpoint/web/page/admin/users/PageUser.java    |  537 +++-----------------
 .../web/page/admin/users/PageUser.properties       |   13 +-
 .../users/component/AccountOperationButtons.html   |   24 -
 .../users/component/AccountOperationButtons.java   |  100 ----
 .../component/AccountOperationButtons.properties   |   20 -
 .../src/main/webapp/js/midpoint/midpoint.js        |    7 +-
 .../midpoint/prism/PrismPropertyValue.java         |    4 +-
 13 files changed, 115 insertions(+), 649 deletions(-)
 delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AccountOperationButtons.html
 delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AccountOperationButtons.java
 delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AccountOperationButtons.properties


hooks/post-receive
-- 
midPoint