Merge authors: Jan Henrik Øverland (janhenrik-overland) ------------------------------------------------------------ revno: 9681 [merge] committer: Jan Henrik Overland <janhenrik.overl...@gmail.com> branch nick: dhis2 timestamp: Fri 2013-02-01 11:31:16 +0100 message: (PT) Basic pivot table functionality. Work in progress. removed: dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/pt.css dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/pt.html dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/pt.js added: dhis-2/dhis-web/dhis-web-pivot/ dhis-2/dhis-web/dhis-web-pivot/pom.xml dhis-2/dhis-web/dhis-web-pivot/src/ dhis-2/dhis-web/dhis-web-pivot/src/main/ dhis-2/dhis-web/dhis-web-pivot/src/main/java/ dhis-2/dhis-web/dhis-web-pivot/src/main/java/org/ dhis-2/dhis-web/dhis-web-pivot/src/main/java/org/hisp/ dhis-2/dhis-web/dhis-web-pivot/src/main/java/org/hisp/dhis/ dhis-2/dhis-web/dhis-web-pivot/src/main/java/org/hisp/dhis/pivot/ dhis-2/dhis-web/dhis-web-pivot/src/main/java/org/hisp/dhis/pivot/action/ dhis-2/dhis-web/dhis-web-pivot/src/main/java/org/hisp/dhis/pivot/action/GetOrganisationUnitChildrenAction.java dhis-2/dhis-web/dhis-web-pivot/src/main/java/org/hisp/dhis/pivot/action/InitializeAction.java dhis-2/dhis-web/dhis-web-pivot/src/main/java/org/hisp/dhis/pivot/action/NoAction.java dhis-2/dhis-web/dhis-web-pivot/src/main/resources/ dhis-2/dhis-web/dhis-web-pivot/src/main/resources/META-INF/ dhis-2/dhis-web/dhis-web-pivot/src/main/resources/META-INF/dhis/ dhis-2/dhis-web/dhis-web-pivot/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-pivot/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/WEB-INF/ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/WEB-INF/classes/ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/WEB-INF/classes/velocity.properties dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/WEB-INF/web.xml dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/arrow.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/arrowleft.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/arrowleftdouble.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/arrowright.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/arrowrightdouble.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/checkbox.gif dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/data.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/datatable.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/edit.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/error_m.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/error_s.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/exit.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/exportimage.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/favorite.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/interpretation.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/node-select-child.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/ok.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/options.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/organisationunit.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/pdf.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/pdf2.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/period.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/png.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/png2.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/refresh.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/tool-sprites.gif dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/warning.png dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/index.html dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.js dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/jsonInitialize.vm dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/jsonminOrganisationUnitChildren.vm 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/plugin.html dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js dhis-2/dhis-web/pom.xml The size of the diff (5669 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 : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
