~stian-sandvold/dhis2/UserSettingFallback
Viewing all changes in revision 21874.
-
Committer:
Stian Sandvold
-
Date:
2016-03-14 12:16:33 UTC
-
mfrom:
(21871.1.422 dhis2)
-
Revision ID:
stian.sandvold@gmail.com-20160314121633-ojggeaoszdunzltj
merge
-
dhis-2/dhis-api/src/main/java/org/hisp/dhis/feedback
-
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/validation
-
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sms
-
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sms/scheduling
-
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/descriptors
-
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/validation
-
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/external/conf
-
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/feedback
-
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/hooks
-
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/fonts/roboto-v15-latin-ext_latin
-
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/material-design-icons
- files removed:
-
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation
-
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors
-
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema
-
dhis-2/dhis-services/dhis-service-eventreporting
-
dhis-2/dhis-services/dhis-service-eventreporting/src
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/org
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/org/hisp
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/org/hisp/dhis
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/org/hisp/dhis/caseaggregation
-
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/org/hisp/dhis/caseaggregation/hibernate
-
dhis-2/dhis-services/dhis-service-eventreporting/src/test
-
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java
-
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org
-
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp
-
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis
-
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation
-
dhis-2/dhis-services/dhis-service-eventreporting/src/test/resources
-
dhis-2/dhis-support/dhis-support-external/src/test/java/org
-
dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp
-
dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp/dhis
-
dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp/dhis/external
-
dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp/dhis/external/conf
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping
-
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/images
-
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/scripts/ext-ux
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/geoext
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/geoext/script
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/widgets/geostat
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers-ux
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/img
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/script
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default
-
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/openlayers/theme/default/img
-
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
-
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/images
-
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/styles
-
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation
-
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule
- files renamed:
-
dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp/dhis/external/conf/DhisConfigurationProviderTest.java
=>
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/external/conf/DhisConfigurationProviderTest.java
expand all
collapse all
Show diffs side-by-side
added
removed