Viewing all changes in revision 5019.
- Committer: Fredrik Haaland
- Date: 2011-11-16 10:57:08 UTC
- mfrom: (4968.2.73 group3_messaging_support)
- Revision ID: fredrhaa@ifi.uio.no-20111116105708-qv36rmpj9qndcx1y
First merge with Group3 - Messaging Support.
- dhis-2/dhis-services/dhis-service-mobile
- dhis-2/dhis-services/dhis-service-mobile/src
- dhis-2/dhis-services/dhis-service-mobile/src/main
- dhis-2/dhis-services/dhis-service-mobile/src/main/java
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/IProgramService.java
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/model
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/model/DataValue.java
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/model/ModelList.java
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/model/comparator
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service
- dhis-2/dhis-services/dhis-service-mobile/src/main/resources
- dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF
- dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis
- dhis-2/dhis-services/dhis-service-mobile/src/main/resources/org
- dhis-2/dhis-services/dhis-service-mobile/src/main/resources/org/hisp
- dhis-2/dhis-services/dhis-service-mobile/src/main/resources/org/hisp/dhis
- dhis-2/dhis-services/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile
- dhis-2/dhis-services/dhis-service-mobile/src/test
- dhis-2/dhis-services/dhis-service-mobile/src/test/java
- dhis-2/dhis-services/dhis-service-mobile/src/test/java/org
- dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp
- dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis
- dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile
- dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api
- dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model
- dhis-2/dhis-services/dhis-service-mobile/src/test/resources
- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/message
- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/message/action
- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/searchService
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/web
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/web/mapping
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/web/resources
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/META-INF
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/META-INF/dhis
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/META-INF
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/WEB-INF
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/WEB-INF/classes
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/css
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/images
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/test
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/test/java
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/test/java/org
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/test/java/org/hisp
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/test/java/org/hisp/dhis
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/test/java/org/hisp/dhis/mobile
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/test/java/org/hisp/dhis/mobile/web
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/test/java/org/hisp/dhis/mobile/web/mapping
- files removed:
- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/CodecUtilsTest.java
- files renamed:
- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/ => dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.11/
- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonOrganisationUnitChildren.vm => dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonminOrganisationUnitChildren.vm
- files modified:
- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java
- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java
- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm
expand all
collapse all
added
removed
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/register.png
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/images/intro.png
