Viewing all changes in revision 5009.
- Committer: Jo Størset
- Date: 2011-11-21 12:44:20 UTC
- mfrom: (4968.1.216 dhis2)
- Revision ID: storset@gmail.com-20111121124420-m0wjqkn46h40lfz7
- Needed to check it, so a little help merging r5184 from trunk
- added dhis-service-mobile as dependency to dhis-web-light
- added dhis-service-mobile as dependency to dhis-web-light
- dhis-2/dhis-api/src/main/java/org/hisp/dhis/codelist
- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common
- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate
- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/common
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/IProgramService.java
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/DataValue.java
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/ModelList.java
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/comparator
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/sms
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/sms/IncomingSmsService.java
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/sms/OutboundSmsService.java
- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/sms/SmsMessageEncoding.java
- dhis-2/dhis-web/dhis-web-api
- dhis-2/dhis-web/dhis-web-api/src
- dhis-2/dhis-web/dhis-web-api/src/main
- dhis-2/dhis-web/dhis-web-api/src/main/java
- dhis-2/dhis-web/dhis-web-api/src/main/java/org
- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp
- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis
- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api
- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller
- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/listener
- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view
- dhis-2/dhis-web/dhis-web-api/src/main/resources
- dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF
- dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis
- dhis-2/dhis-web/dhis-web-api/src/main/webapp
- dhis-2/dhis-web/dhis-web-api/src/main/webapp/WEB-INF
- dhis-2/dhis-web/dhis-web-api2/src/main/java/org/hisp/dhis/web/api2
- dhis-2/dhis-web/dhis-web-api2/src/main/java/org/hisp/dhis/web/api2/HtmlPromotingUriConnegFilter.java
- dhis-2/dhis-web/dhis-web-api2/src/main/java/org/hisp/dhis/web/api2/action
- dhis-2/dhis-web/dhis-web-api2/src/main/java/org/hisp/dhis/web/api2/action/ImportDataValueAction.java
- dhis-2/dhis-web/dhis-web-api2/src/main/java/org/hisp/dhis/web/api2/mapping
- dhis-2/dhis-web/dhis-web-api2/src/main/java/org/hisp/dhis/web/api2/resources
- dhis-2/dhis-web/dhis-web-api2/src/main/resources/dhis-web-api2
- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/scheduling
- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin
- local/vn/dhis-web-spreadsheet-reporting/src/main/webapp/dhis-web-spreadsheet-reporting/javascript/jQuery
- files removed:
- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/comparator/ChartTitleComparator.java
- 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-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api
- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/action
- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/mapping
- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources
- dhis-2/dhis-web/dhis-web-api/src/main/resources/dhis-web-api
- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/scheduling
- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/scheduling/action
- files renamed:
- dhis-2/dhis-web/dhis-web-api/ => dhis-2/dhis-web/dhis-web-api2/
- 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:
- .bzrignore
- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueStoreTest.java
- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
expand all
collapse all
added
removed
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/mobile.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/calendar2.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowleft.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowleftdouble.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowright.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/arrowrightdouble.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/checkbox.gif
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/datatable.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/exportimage.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/pdf.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/pie.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/png.png
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/tool-sprites.gif
