[midPoint-git] midPoint branch parser updated. v2.3devel-1211-g78ca5fb
Radovan Semancik
git at evolveum.com
Thu Feb 13 13:25:56 CET 2014
Project "midPoint" branch parser has been updated
via 78ca5fb05acda0afc3bcd05f5379c0ea3637aa4b (commit) v2.3devel-1211-g78ca5fb
via b6f781970e228eac85a3374fcf2028f12756290c (commit) v2.3devel-1122-gb6f7819
via f7cd8428ae0b7a127158f2603f1fc3fe7a426f46 (commit) v2.3devel-1121-gf7cd842
via b272bf95337adeea0e5953a7a8bdeb202d35509e (commit) v2.3devel-1120-gb272bf9
via e51e5c21a6f629873b9e0860e00f8f758743cf90 (commit) v2.3devel-1119-ge51e5c2
via 9a4fee9cf363e946f6ae71876fb7473328dd6f83 (commit) v2.3devel-1118-g9a4fee9
via c65168ea9e632adbf314d7d2530f658329c45f32 (commit) v2.3devel-1117-gc65168e
via eed29a0c5a4c06976505412f8c93d6917ec67b39 (commit) v2.3devel-1115-geed29a0
via 908347617582040ff4a40576fd119b37604249e4 (commit) v2.3devel-1115-g9083476
via 3e2a0cdf7ab00340ec54c9645cd18581f9c9ac7d (commit) v2.3devel-1114-g3e2a0cd
via 791a16cd568ffa23597229516f03759b87bfd0e6 (commit) v2.3devel-1113-g791a16c
via 0f003ad37a79cbc3672328ee517f2aad2e1fa9b7 (commit) v2.3devel-1112-g0f003ad
via e9203d84090d3e1503c2cb92f9f10436d1eb52a2 (commit) v2.3devel-1111-ge9203d8
via 4856ef7d70466aae24e9eac01e65b24f486d7bbf (commit) v2.3devel-1110-g4856ef7
via 549785b7ac3c3ff707baef75e4ce9743b720abbf (commit) v2.3devel-1109-g549785b
via f08bc073afdd40d120f6bcace50d72526efd0b16 (commit) v2.3devel-1108-gf08bc07
via 10dcae07048b8fc9397989144007f35e30ca0ba1 (commit) v2.3devel-1107-g10dcae0
via 9e0f4a3f124dfc38c1b6ab69e03cabe7a737c092 (commit) v2.3devel-1097-g9e0f4a3
from fe14785b9dc1213bb2c676e0f4b2a200bd86639d (commit) v2.3devel-1193-gfe14785
- Log -----------------------------------------------------------------
commit 78ca5fb05acda0afc3bcd05f5379c0ea3637aa4b
Merge: fe14785 b6f7819
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: Thu Feb 13 13:19:08 2014 +0100
Merge branch 'master' into parser
Conflicts:
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
-----------------------------------------------------------------------
(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:
.../data/DoubleButtonPanel_en_US.utf8.properties | 2 +
.../DoubleButtonColumn_en_US.utf8.properties | 1 -
.../input/UploadPanel_en_US.utf8.properties | 4 +
.../ItemApprovalPanel_en_US.utf8.properties | 2 +-
.../LoggingConfigPanel_en_US.utf8.properties | 33 +-
.../SystemConfigPanel_en_US.utf8.properties | 8 +-
.../admin/reports/PageReport_en_US.utf8.properties | 6 +
.../component/AceEditorPanel_en_US.utf8.properties | 2 +
.../ReportButtonPanel_en_US.utf8.properties | 3 -
.../ReportConfigurationPanel_en_US.utf8.properties | 2 +
.../SingleButtonRowPanel_en_US.utf8.properties | 2 -
.../UserReportConfigPanel_en_US.utf8.properties | 5 +
.../admin/users/PageOrgTree_en_US.utf8.properties | 2 +-
.../MidPointApplication_en_US.utf8.properties | 32 +-
.../data/DoubleButtonPanel_sk_SK.utf8.properties | 2 +
.../DoubleButtonColumn_sk_SK.utf8.properties | 1 -
.../input/UploadPanel_sk_SK.utf8.properties | 4 +
.../ItemApprovalPanel_sk_SK.utf8.properties | 2 +-
.../LoggingConfigPanel_sk_SK.utf8.properties | 18 +-
.../SystemConfigPanel_sk_SK.utf8.properties | 4 +-
.../admin/reports/PageReport_sk_SK.utf8.properties | 6 +
.../component/AceEditorPanel_sk_SK.utf8.properties | 2 +
.../AuditPopupPanel_sk_SK.utf8.properties | 5 +-
.../ReconciliationPopupPanel_sk_SK.utf8.properties | 4 +-
.../ReportButtonPanel_sk_SK.utf8.properties | 3 -
.../ReportConfigurationPanel_sk_SK.utf8.properties | 2 +
.../SingleButtonRowPanel_sk_SK.utf8.properties | 2 -
.../UserReportConfigPanel_sk_SK.utf8.properties | 5 +
.../admin/roles/PageRoles_sk_SK.utf8.properties | 31 +-
.../admin/users/PageOrgTree_sk_SK.utf8.properties | 2 +-
.../MidPointApplication_sk_SK.utf8.properties | 32 +-
.../midpoint/web/component}/AsyncUpdatePanel.html | 0
.../midpoint/web/component}/AsyncUpdatePanel.java | 4 +-
.../midpoint/web/component/GuiComponents.java | 0
.../midpoint/web/component/accordion/Accordion.css | 216 +-
.../web/component/accordion/Accordion.html | 0
.../web/component/accordion/Accordion.java | 0
.../midpoint/web/component/accordion/Accordion.js | 234 +-
.../web/component/accordion/AccordionItem.html | 0
.../web/component/accordion/AccordionItem.java | 72 +-
.../web/component/accordion/accordionArrow.png | Bin 2926 -> 2926 bytes
.../web/component/accordion/accordionHeaderBg.png | Bin 124 -> 124 bytes
.../component/accordion/accordionHeaderBgOver.png | Bin 118 -> 118 bytes
.../web/component/atmosphere/GuiTaskHandler.java | 70 -
.../web/component/atmosphere/NotifyMessage.java | 76 +-
.../midpoint/web/component/input/UploadPanel.html | 21 +-
.../midpoint/web/component/input/UploadPanel.java | 10 +
.../web/component/message/MainFeedback.css | 665 --
.../web/component/message/MainFeedback.java | 2 -
.../midpoint/web/component/message/MainFeedback.js | 251 +-
.../web/component/message/messages-error-arrow.png | Bin 2930 -> 0 bytes
.../web/component/message/messages-error-icon.png | Bin 3370 -> 0 bytes
.../web/component/message/messages-info-arrow.png | Bin 2924 -> 0 bytes
.../web/component/message/messages-info-icon.png | Bin 3371 -> 0 bytes
.../web/component/message/messages-succ-arrow.png | Bin 2913 -> 0 bytes
.../web/component/message/messages-succ-icon.png | Bin 3610 -> 0 bytes
.../web/component/message/messages-warn-arrow.png | Bin 2913 -> 0 bytes
.../web/component/message/messages-warn-icon.png | Bin 3309 -> 0 bytes
.../component/util/AjaxCallListenerFactory.java | 0
.../web/component/util/BaseSimplePanel.java | 0
.../web/component/util}/CallableResult.java | 2 +-
.../web/component/util}/FutureUpdateBehavior.java | 4 +-
.../midpoint/web/component/util/LoadableModel.java | 0
.../web/component/util/VisibleEnableBehaviour.java | 0
.../com/evolveum/midpoint/web/page/PageBase.html | 9 +-
.../com/evolveum/midpoint/web/page/PageBase.java | 19 +
.../page/admin/configuration/PageDebugList.java | 10 +-
.../component/LoggingConfigPanel.properties | 14 +-
.../configuration/component/SystemConfigPanel.html | 8 +-
.../configuration/component/SystemConfigPanel.java | 15 +-
.../component/SystemConfigPanel.properties | 1 +
.../page/admin/configuration/dto/LoggingDto.java | 4 +-
.../admin/configuration/dto/StandardLogger.java | 13 +
.../web/page/admin/reports/PageCreatedReports.java | 12 +-
.../web/page/admin/resources/PageResources.java | 10 +-
.../resources/content/PageContentAccounts.java | 13 +-
.../midpoint/web/page/admin/roles/PageRoles.java | 12 +-
.../web/page/admin/server/PageTaskAdd.html | 4 +-
.../web/page/admin/server/PageTaskAdd.java | 39 +-
.../web/page/admin/server/PageTaskEdit.html | 4 +-
.../web/page/admin/server/PageTaskEdit.java | 42 +-
.../midpoint/web/page/admin/users/PageUser.java | 4 +-
.../midpoint/web/page/admin/users/PageUsers.java | 19 +-
.../midpoint/web/security/MidPointApplication.java | 33 +
.../midpoint/web/util/SearchFormEnterBehavior.java | 52 +
.../midpoint/web/util/TooltipBehavior.java | 62 +
gui/admin-gui/src/main/webapp/css/reset.css | 75 -
gui/admin-gui/src/main/webapp/css/tipsy.css | 30 -
.../message => webapp/img}/messages-exp-icon.png | Bin 3521 -> 3521 bytes
gui/admin-gui/src/main/webapp/js/easing.js | 146 -
gui/admin-gui/src/main/webapp/js/jquery-1.10.2.js | 9789 --------------------
gui/admin-gui/src/main/webapp/js/tipsy.js | 262 -
.../src/main/webapp/less/midpoint/midpoint.less | 1 +
.../webapp/less/midpoint/operation-result.less | 642 ++
gui/gui-components/.gitignore | 1 -
gui/gui-components/pom.xml | 124 -
.../web/component/resource/img/ImgResources.java | 26 -
.../web/component/resource/img/ajax-loader.gif | Bin 847 -> 0 bytes
gui/gui-components/testng.xml | 22 -
gui/pom.xml | 1 -
.../midpoint/report/ReportCreateTaskHandler.java | 4 +-
.../evolveum/midpoint/report/BasicReportTest.java | 13 +-
.../report-impl/src/test}/resources/DejaVuSans.ttf | Bin 622020 -> 622020 bytes
.../src/test/resources/reports/reportAuditLogs.xml | 56 +-
.../resources/reports/reportReconciliation.xml | 360 +
105 files changed, 1886 insertions(+), 11921 deletions(-)
create mode 100644 gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/data/DoubleButtonPanel_en_US.utf8.properties
delete mode 100644 gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/data/column/DoubleButtonColumn_en_US.utf8.properties
create mode 100644 gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/input/UploadPanel_en_US.utf8.properties
rename gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/{ => processes/itemApproval}/ItemApprovalPanel_en_US.utf8.properties (94%)
create mode 100644 gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/PageReport_en_US.utf8.properties
create mode 100644 gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel_en_US.utf8.properties
delete mode 100644 gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReportButtonPanel_en_US.utf8.properties
create mode 100644 gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel_en_US.utf8.properties
delete mode 100644 gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/SingleButtonRowPanel_en_US.utf8.properties
create mode 100644 gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/UserReportConfigPanel_en_US.utf8.properties
create mode 100644 gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/data/DoubleButtonPanel_sk_SK.utf8.properties
delete mode 100644 gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/data/column/DoubleButtonColumn_sk_SK.utf8.properties
create mode 100644 gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/input/UploadPanel_sk_SK.utf8.properties
rename gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/{ => processes/itemApproval}/ItemApprovalPanel_sk_SK.utf8.properties (94%)
create mode 100644 gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/PageReport_sk_SK.utf8.properties
create mode 100644 gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel_sk_SK.utf8.properties
delete mode 100644 gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReportButtonPanel_sk_SK.utf8.properties
create mode 100644 gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel_sk_SK.utf8.properties
delete mode 100644 gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/SingleButtonRowPanel_sk_SK.utf8.properties
create mode 100644 gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/UserReportConfigPanel_sk_SK.utf8.properties
rename gui/{gui-components/src/main/java/com/evolveum/midpoint/web/component/async => admin-gui/src/main/java/com/evolveum/midpoint/web/component}/AsyncUpdatePanel.html (100%)
rename gui/{gui-components/src/main/java/com/evolveum/midpoint/web/component/async => admin-gui/src/main/java/com/evolveum/midpoint/web/component}/AsyncUpdatePanel.java (97%)
rename gui/{gui-components => admin-gui}/src/main/java/com/evolveum/midpoint/web/component/GuiComponents.java (100%)
rename gui/{gui-components => admin-gui}/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.css (96%)
rename gui/{gui-components => admin-gui}/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.html (100%)
rename gui/{gui-components => admin-gui}/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.java (100%)
rename gui/{gui-components => admin-gui}/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.js (97%)
rename gui/{gui-components => admin-gui}/src/main/java/com/evolveum/midpoint/web/component/accordion/AccordionItem.html (100%)
rename gui/{gui-components => admin-gui}/src/main/java/com/evolveum/midpoint/web/component/accordion/AccordionItem.java (97%)
rename gui/{gui-components => admin-gui}/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionArrow.png (100%)
rename gui/{gui-components => admin-gui}/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionHeaderBg.png (100%)
rename gui/{gui-components => admin-gui}/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionHeaderBgOver.png (100%)
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/GuiTaskHandler.java
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/MainFeedback.css
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-error-arrow.png
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-error-icon.png
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-info-arrow.png
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-info-icon.png
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-succ-arrow.png
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-succ-icon.png
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-warn-arrow.png
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-warn-icon.png
rename gui/{gui-components => admin-gui}/src/main/java/com/evolveum/midpoint/web/component/util/AjaxCallListenerFactory.java (100%)
rename gui/{gui-components => admin-gui}/src/main/java/com/evolveum/midpoint/web/component/util/BaseSimplePanel.java (100%)
rename gui/{gui-components/src/main/java/com/evolveum/midpoint/web/component/async => admin-gui/src/main/java/com/evolveum/midpoint/web/component/util}/CallableResult.java (96%)
rename gui/{gui-components/src/main/java/com/evolveum/midpoint/web/component/async => admin-gui/src/main/java/com/evolveum/midpoint/web/component/util}/FutureUpdateBehavior.java (94%)
rename gui/{gui-components => admin-gui}/src/main/java/com/evolveum/midpoint/web/component/util/LoadableModel.java (100%)
rename gui/{gui-components => admin-gui}/src/main/java/com/evolveum/midpoint/web/component/util/VisibleEnableBehaviour.java (100%)
create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/SearchFormEnterBehavior.java
create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TooltipBehavior.java
delete mode 100644 gui/admin-gui/src/main/webapp/css/reset.css
delete mode 100644 gui/admin-gui/src/main/webapp/css/tipsy.css
rename gui/admin-gui/src/main/{java/com/evolveum/midpoint/web/component/message => webapp/img}/messages-exp-icon.png (100%)
delete mode 100644 gui/admin-gui/src/main/webapp/js/easing.js
delete mode 100644 gui/admin-gui/src/main/webapp/js/jquery-1.10.2.js
delete mode 100644 gui/admin-gui/src/main/webapp/js/tipsy.js
create mode 100644 gui/admin-gui/src/main/webapp/less/midpoint/operation-result.less
delete mode 100644 gui/gui-components/.gitignore
delete mode 100644 gui/gui-components/pom.xml
delete mode 100644 gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/resource/img/ImgResources.java
delete mode 100644 gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/resource/img/ajax-loader.gif
delete mode 100644 gui/gui-components/testng.xml
copy {gui/admin-gui/src/main => model/report-impl/src/test}/resources/DejaVuSans.ttf (100%)
create mode 100644 model/report-impl/src/test/resources/reports/reportReconciliation.xml
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list