Merge authors: Jan Henrik Øverland (janhenrik-overland) ------------------------------------------------------------ revno: 13957 [merge] committer: Jan Henrik Overland <[email protected]> branch nick: dhis2 timestamp: Sat 2014-02-08 22:40:21 +0100 message: ER, user interface for new event report app, work in progress + GIS, paging test code removed. added: dhis-2/dhis-web/dhis-web-event-reports/ dhis-2/dhis-web/dhis-web-event-reports/pom.xml dhis-2/dhis-web/dhis-web-event-reports/src/ dhis-2/dhis-web/dhis-web-event-reports/src/main/ dhis-2/dhis-web/dhis-web-event-reports/src/main/java/ dhis-2/dhis-web/dhis-web-event-reports/src/main/resources/ dhis-2/dhis-web/dhis-web-event-reports/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/WEB-INF/ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/WEB-INF/classes/ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/WEB-INF/classes/velocity.properties dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/WEB-INF/web.xml dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/i18n.json dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/arrow.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/arrowdown.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/arrowdowndouble.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/arrowleft.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/arrowleftdouble.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/arrowright.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/arrowrightdouble.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/arrowupdown.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/chart_14.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/check-un.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/check.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/checkbox.gif dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/clear-over_20.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/clear_20.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/data.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/dataelementgroupset.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/datatable.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/dl_datasource.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/dl_image.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/dl_tablelayout.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/edit.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/error_m.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/error_s.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/exit.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/favorite.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/gear_18.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/grid-dashboard_16.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/grid-delete_16.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/grid-edit_16.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/grid-save_16.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/grid-sharing_16.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/interpretation.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/leaf.gif dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/map_14.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/node-select-child.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/ok.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/options.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/organisationunit.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/organisationunitgroupset.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/period.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/search_14.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/table_14.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/tool-sprites.gif dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/warning.png dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/index.html dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/manifest.webapp dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/plugin.js dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/styles/ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/styles/style.css modified: dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/index.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js The size of the diff (12718 lines) is larger than your specified limit of 5000 lines
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription _______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
