Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revision-diff.txt (109 KB)
···
------------------------------------------------------------
revno: 16542 [merge]
committer: Jan Henrik Overland <janhenrik.overland@gmail.com>
branch nick: dhis2
timestamp: Wed 2014-08-27 15:12:22 +0200
message:
PT DV GIS ER EV restructured.
removed:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/jquery.calendars.picker.dhis2.css
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonFacilities.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonmin.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonminValues.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonBaseCoordinate.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonDataElementGroupSets.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonDataElementGroups.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonGeoJsonFiles.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonIndicatorGroups.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonInfrastructuralAggregatedMapValues.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonInitialize.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMap.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLayers.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegendSet.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegendSets.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegends.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelation.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelations.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapView.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapViews.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitLevels.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOrganisationUnits.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOutputFile.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonPeriods.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonUserSettings.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminAggregatedMapValues.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminDataElements.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminIndicators.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapLegendSets.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapOrganisationUnitRelations.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapViews.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMaps.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnitGroups.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnits.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/void.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/javaProperties.js
renamed:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/i18n/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/images/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/images/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/index.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/manifest.webapp => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/manifest.webapp
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/scripts/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/styles/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/i18n/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/images/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/images/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/index.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/manifest.webapp => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/manifest.webapp
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/scripts/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/styles/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/styles/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/images/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/index.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/manifest.webapp => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/manifest.webapp
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/plugin.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/plugin.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/styles/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/images/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/images/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/index.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/manifest.webapp => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/manifest.webapp
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/plugin.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/styles/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/images/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/images/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/index.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/manifest.webapp => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/manifest.webapp
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/plugin.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/scripts/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/styles/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.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