[midPoint-git] midPoint branch bootstrap updated. v2.3devel-234-gc9d022a
Vilo Repan
git at evolveum.com
Mon Oct 21 17:52:28 CEST 2013
Project "midPoint" branch bootstrap has been updated
via c9d022ad24fea918886976ae8bc0e81711a8c1d7 (commit) v2.3devel-234-gc9d022a
via 49aa6fb621a6928f3bb66c05bc90c81644eecd8d (commit) v2.3devel-232-g49aa6fb
via a84e71aa940f92619301e48f34580b893eeec588 (commit) v2.3devel-231-ga84e71a
via 218286c375154da4df0808e52dd4cdb15aa27fdb (commit) v2.3devel-125-g218286c
via a188a00bfbbd8c17b661ff422442c54973a58b09 (commit) v2.3devel-230-ga188a00
via cfd02c4bf17fa1173ea303a6417d48f3d5817fe0 (commit) v2.3devel-229-gcfd02c4
via 7c489935994b23575ab8e3fe4a8731f97c6fed99 (commit) v2.3devel-227-g7c48993
via 1410006bb36d99a53e720c6e825c077281e8d0cf (commit) v2.3devel-124-g1410006
via 4fd5dc58c5d028c5bb3543effdc46e222410c996 (commit) v2.3devel-226-g4fd5dc5
from f86cd05cbd880e4e4f0a828767d6e04f33be5720 (commit) v2.3devel-225-gf86cd05
- Log -----------------------------------------------------------------
commit c9d022ad24fea918886976ae8bc0e81711a8c1d7
Merge: 49aa6fb 218286c
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Oct 21 17:47:02 2013 +0200
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
commit 49aa6fb621a6928f3bb66c05bc90c81644eecd8d
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Oct 21 17:46:44 2013 +0200
configuration panel in resource wizard, not finished yet.
commit a84e71aa940f92619301e48f34580b893eeec588
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Oct 21 17:46:21 2013 +0200
prism form styles update, something will probably break :)
commit a188a00bfbbd8c17b661ff422442c54973a58b09
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Oct 21 14:46:58 2013 +0200
less, js and css files marked as deprecated.
commit cfd02c4bf17fa1173ea303a6417d48f3d5817fe0
Merge: 7c48993 1410006
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Oct 21 13:21:42 2013 +0200
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
commit 7c489935994b23575ab8e3fe4a8731f97c6fed99
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Oct 21 13:21:34 2013 +0200
wizards steps (in header). used in resource wizard as sample.
commit 4fd5dc58c5d028c5bb3543effdc46e222410c996
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Oct 21 12:17:18 2013 +0200
empty find users page.
-----------------------------------------------------------------------
(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/input/PasswordPanel.html | 2 +-
.../midpoint/web/component/prism/AddSmall.png | Bin 534 -> 0 bytes
.../midpoint/web/component/prism/DeleteSmall.png | Bin 575 -> 0 bytes
.../web/component/prism/PrismContainerPanel.html | 8 +-
.../web/component/prism/PrismContainerPanel.java | 14 ++
.../web/component/prism/PrismObjectPanel.css | 158 +-------------------
.../web/component/prism/PrismObjectPanel.html | 5 +-
.../web/component/prism/PrismPropertyPanel.html | 22 ++-
.../web/component/prism/PrismPropertyPanel.java | 38 ++++-
.../web/component/prism/PrismValuePanel.html | 26 ++--
.../web/component/prism/PrismValuePanel.java | 41 ++---
.../web/component/prism/PropertyWrapper.java | 8 +
.../midpoint/web/component/wizard/Wizard.java | 30 +++-
.../midpoint/web/component/wizard/WizardStep.java | 51 +++++++
...zationStep.properties => WizardStep.properties} | 1 +
.../component/wizard/resource/CapabilityStep.java | 3 +-
.../wizard/resource/CapabilityStep.properties | 2 +-
.../wizard/resource/ConfigurationStep.html | 2 +-
.../wizard/resource/ConfigurationStep.java | 36 ++++-
.../wizard/resource/ConfigurationStep.properties | 1 +
.../web/component/wizard/resource/NameStep.html | 4 +-
.../web/component/wizard/resource/NameStep.java | 10 +-
.../component/wizard/resource/NameStep.properties | 2 +-
.../wizard/resource/SchemaHandlingStep.java | 3 +-
.../wizard/resource/SchemaHandlingStep.properties | 2 +-
.../web/component/wizard/resource/SchemaStep.java | 2 +-
.../wizard/resource/SchemaStep.properties | 1 +
.../wizard/resource/SynchronizationStep.java | 3 +-
.../wizard/resource/SynchronizationStep.properties | 2 +-
.../midpoint/web/page/admin/PageAdmin.java | 3 +-
.../{PageOrgStruct.html => PageFindUsers.html} | 2 +-
.../web/page/admin/users/PageFindUsers.java | 22 +--
.../web/page/admin/users/PageFindUsers.properties} | 3 +-
.../midpoint/web/security/PageUrlMapping.java | 1 +
gui/admin-gui/src/main/webapp/css/css-fixed-IE.css | 4 +
.../src/main/webapp/css/css-fixed-nonIE.css | 4 +
gui/admin-gui/src/main/webapp/css/evolveum.css | 4 +
gui/admin-gui/src/main/webapp/css/reset.css | 4 +
gui/admin-gui/src/main/webapp/css/tipsy.css | 4 +
gui/admin-gui/src/main/webapp/js/easing.js | 4 +
gui/admin-gui/src/main/webapp/js/evolveum.js | 4 +
gui/admin-gui/src/main/webapp/js/tipsy.js | 4 +
gui/admin-gui/src/main/webapp/less/config.less | 4 +
.../src/main/webapp/less/evolveum-obsolete.less | 4 +
gui/admin-gui/src/main/webapp/less/global.less | 4 +
.../src/main/webapp/less/midpoint/midpoint.less | 1 +
.../main/webapp/less/midpoint/prism-container.less | 51 +++++++
.../common/security/AuthorizationConstants.java | 3 +
.../ns/public/model/context/model-context-2.xsd | 14 ++
.../midpoint/model/lens/ChangeExecutor.java | 34 +++--
.../midpoint/model/lens/LensProjectionContext.java | 39 +++++
.../midpoint/model/sync/action/AddUserAction.java | 2 +-
.../midpoint/model/sync/action/BaseAction.java | 3 +-
.../model/sync/action/DeleteUserAction.java | 2 +-
.../model/sync/action/ModifyUserAction.java | 2 +-
.../model/sync/action/SynchronizeAction.java | 2 +-
.../model/sync/TestSynchronizationService.java | 59 ++++++++
.../model/test/AbstractModelIntegrationTest.java | 29 ++++
58 files changed, 509 insertions(+), 284 deletions(-)
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AddSmall.png
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DeleteSmall.png
copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/{resource/SynchronizationStep.properties => WizardStep.properties} (97%)
copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/{PageOrgStruct.html => PageFindUsers.html} (93%)
copy testing/selenium/src/test/java/com/evolveum/midpoint/selenium/UserListTest.java => gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageFindUsers.java (60%)
copy gui/{admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep_sk_SK.utf8.properties => admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageFindUsers.properties} (92%)
create mode 100644 gui/admin-gui/src/main/webapp/less/midpoint/prism-container.less
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list