Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revision-diff.txt (47.6 KB)
···
------------------------------------------------------------
revno: 7640 [merge]
committer: Jan Henrik Overland <janhenrik.overland@gmail.com>
branch nick: dhis2
timestamp: Thu 2012-07-19 16:22:19 +0200
message:
(GIS) Boundary layer image export support + Increased toolbar icons size + i18n fixes.
removed:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/baselayer.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/boundary.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/boundary_small.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/calendar2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/centroid.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/centroid_small.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/clear2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/drilldown.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/edit2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/exit2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/export3.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/filter.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/gear.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2_small.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/image2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/information2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/labels.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/legendset.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/measure.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/overlay.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/question.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/refresh.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/relocate.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/search2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol_small.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic1.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic1_small.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic2_small.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/transparency2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_in2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_out2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_world2.png
added:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/accept.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/baselayer.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/boundary.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/boundary_small.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/calendar2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/cancel2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/centroid.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/centroid_small.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/clear2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/drilldown.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/edit2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/exit2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/export3.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/favorite.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/favorite_medium.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/filter.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/gear.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/history2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/history2_small.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/image2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/information2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/labels.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/legendset.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/loader.gif
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/measure.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/overlay.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/question.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/refresh.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/register.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/relocate.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/remove.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/resize.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/search2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/settings.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/settings_small.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol_small.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic1.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic1_small.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic2_small.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/transparency2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_in2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_out2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_world2.png
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js
--
lp:dhis2
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to OpenID transaction in progress