[midPoint-git] midPoint branch master updated. v2.3devel-962-gf0aa25a
Vilo Repan
git at evolveum.com
Sat Jan 18 00:18:59 CET 2014
Project "midPoint" branch master has been updated
via f0aa25af2d352c34905aafe2e52c96aa5865cae5 (commit) v2.3devel-962-gf0aa25a
via b9c0e52ebc739e6a60cffda185e9a90166799eb9 (commit) v2.3devel-953-gb9c0e52
via e5bbbd580495241fe057219eb60cd1303782d5a8 (commit) v2.3devel-952-ge5bbbd5
via 537f528d743ecd6c24a02b7359be624b80d8837d (commit) v2.3devel-951-g537f528
via f7c508df7b4a02a7d05cec3e10250c195a2ec1c7 (commit) v2.3devel-950-gf7c508d
from f0bcdf5ca3b54c140e4d6b737960f6c71c2f7dbb (commit) v2.3devel-957-gf0bcdf5
- Log -----------------------------------------------------------------
commit f0aa25af2d352c34905aafe2e52c96aa5865cae5
Merge: b9c0e52 f0bcdf5
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Sat Jan 18 00:15:13 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
Conflicts:
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/ItemApprovalPanel.java
commit b9c0e52ebc739e6a60cffda185e9a90166799eb9
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Sat Jan 18 00:06:04 2014 +0100
moved ace editor component
commit e5bbbd580495241fe057219eb60cd1303782d5a8
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Sat Jan 18 00:05:55 2014 +0100
moved localization files
commit 537f528d743ecd6c24a02b7359be624b80d8837d
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Sat Jan 18 00:02:34 2014 +0100
moved wf.* components to common package
commit f7c508df7b4a02a7d05cec3e10250c195a2ec1c7
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Fri Jan 17 23:55:02 2014 +0100
added font awesome resources.
-----------------------------------------------------------------------
(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:
.../DecisionsPanel_en_US.utf8.properties | 0
.../ItemApprovalPanel_en_US.utf8.properties | 0
.../WfDeltasPanel_en_US.utf8.properties | 0
.../WfHistoryPanel_en_US.utf8.properties | 0
.../WorkItemsPanel_en_US.utf8.properties | 0
.../DecisionsPanel_sk_SK.utf8.properties | 0
.../ItemApprovalPanel_sk_SK.utf8.properties | 0
.../WfDeltasPanel_sk_SK.utf8.properties | 0
.../WfHistoryPanel_sk_SK.utf8.properties | 0
.../WorkItemsPanel_sk_SK.utf8.properties | 0
.../web/component/{xml/ace => }/AceEditor.java | 2 +-
.../web/component/menu/cog/InlineMenu.html | 2 +-
.../wf/{decisions => }/DecisionsPanel.html | 0
.../wf/{decisions => }/DecisionsPanel.java | 2 +-
.../wf/{decisions => }/DecisionsPanel.properties | 0
.../itemApproval => }/ItemApprovalPanel.html | 0
.../itemApproval => }/ItemApprovalPanel.java | 5 +-
.../itemApproval => }/ItemApprovalPanel.properties | 0
.../component/wf/{deltas => }/WfDeltasPanel.html | 70 +-
.../component/wf/{deltas => }/WfDeltasPanel.java | 2 +-
.../wf/{deltas => }/WfDeltasPanel.properties | 0
.../wf/{history => }/WfHistoryEventDto.java | 162 +--
.../component/wf/{history => }/WfHistoryPanel.html | 48 +-
.../component/wf/{history => }/WfHistoryPanel.java | 10 +-
.../wf/{history => }/WfHistoryPanel.properties | 0
.../wf/{workItems => }/WorkItemsPanel.html | 0
.../wf/{workItems => }/WorkItemsPanel.java | 2 +-
.../wf/{workItems => }/WorkItemsPanel.properties | 0
.../wizard/resource/component/XmlEditorPanel.java | 2 +-
.../com/evolveum/midpoint/web/page/PageBase.html | 1 +
.../page/admin/configuration/PageDebugView.java | 2 +-
.../page/admin/configuration/PageImportObject.java | 2 +-
.../web/page/admin/home/PageDashboard.java | 6 +-
.../web/page/admin/resources/PageResourceEdit.java | 2 +-
.../page/admin/resources/PageResourceWizard.java | 2 +-
.../midpoint/web/page/admin/roles/PageRole.java | 3 +-
.../web/page/admin/server/dto/TaskDto.java | 2 +-
.../WorkflowInformationPanel.java | 6 +-
gui/admin-gui/src/main/webapp/css/font-awesome.css | 1338 ++++++++++++++++++++
.../src/main/webapp/fonts/FontAwesome.otf | Bin 0 -> 62856 bytes
.../src/main/webapp/fonts/fontawesome-webfont.eot | Bin 0 -> 38205 bytes
.../src/main/webapp/fonts/fontawesome-webfont.svg | 414 ++++++
.../src/main/webapp/fonts/fontawesome-webfont.ttf | Bin 0 -> 80652 bytes
.../src/main/webapp/fonts/fontawesome-webfont.woff | Bin 0 -> 44432 bytes
.../fonts/glyphicons-halflings-regular.eot | Bin 14079 -> 14079 bytes
.../fonts/glyphicons-halflings-regular.svg | 0
.../fonts/glyphicons-halflings-regular.ttf | Bin 29512 -> 29512 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 16448 -> 16448 bytes
.../src/main/webapp/less/bootstrap/variables.less | 2 +-
49 files changed, 1913 insertions(+), 174 deletions(-)
rename gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/{decisions => }/DecisionsPanel_en_US.utf8.properties (100%)
rename gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/{processes/itemApproval => }/ItemApprovalPanel_en_US.utf8.properties (100%)
rename gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/{deltas => }/WfDeltasPanel_en_US.utf8.properties (100%)
rename gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/{history => }/WfHistoryPanel_en_US.utf8.properties (100%)
rename gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/{workItems => }/WorkItemsPanel_en_US.utf8.properties (100%)
rename gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/{decisions => }/DecisionsPanel_sk_SK.utf8.properties (100%)
rename gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/{processes/itemApproval => }/ItemApprovalPanel_sk_SK.utf8.properties (100%)
rename gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/{deltas => }/WfDeltasPanel_sk_SK.utf8.properties (100%)
rename gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/{history => }/WfHistoryPanel_sk_SK.utf8.properties (100%)
rename gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/{workItems => }/WorkItemsPanel_sk_SK.utf8.properties (100%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/{xml/ace => }/AceEditor.java (97%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{decisions => }/DecisionsPanel.html (100%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{decisions => }/DecisionsPanel.java (97%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{decisions => }/DecisionsPanel.properties (100%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{processes/itemApproval => }/ItemApprovalPanel.html (100%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{processes/itemApproval => }/ItemApprovalPanel.java (98%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{processes/itemApproval => }/ItemApprovalPanel.properties (100%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{deltas => }/WfDeltasPanel.html (96%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{deltas => }/WfDeltasPanel.java (98%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{deltas => }/WfDeltasPanel.properties (100%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{history => }/WfHistoryEventDto.java (94%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{history => }/WfHistoryPanel.html (96%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{history => }/WfHistoryPanel.java (80%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{history => }/WfHistoryPanel.properties (100%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{workItems => }/WorkItemsPanel.html (100%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{workItems => }/WorkItemsPanel.java (98%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/{workItems => }/WorkItemsPanel.properties (100%)
create mode 100644 gui/admin-gui/src/main/webapp/css/font-awesome.css
create mode 100644 gui/admin-gui/src/main/webapp/fonts/FontAwesome.otf
create mode 100755 gui/admin-gui/src/main/webapp/fonts/fontawesome-webfont.eot
create mode 100755 gui/admin-gui/src/main/webapp/fonts/fontawesome-webfont.svg
create mode 100755 gui/admin-gui/src/main/webapp/fonts/fontawesome-webfont.ttf
create mode 100755 gui/admin-gui/src/main/webapp/fonts/fontawesome-webfont.woff
rename gui/admin-gui/src/main/webapp/{less => }/fonts/glyphicons-halflings-regular.eot (100%)
rename gui/admin-gui/src/main/webapp/{less => }/fonts/glyphicons-halflings-regular.svg (100%)
rename gui/admin-gui/src/main/webapp/{less => }/fonts/glyphicons-halflings-regular.ttf (100%)
rename gui/admin-gui/src/main/webapp/{less => }/fonts/glyphicons-halflings-regular.woff (100%)
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list