Merge authors:
Morten Olav Hansen (mortenoh)
revision-diff.txt (12.1 KB)
···
------------------------------------------------------------
revno: 5367 [merge]
committer: Morten Olav Hansen <mortenoh@gmail.com>
branch nick: dhis2
timestamp: Mon 2011-12-12 12:20:20 +0100
message:
dxf2merge: tightened security for /api, now requires ALL or F_WEBAPI_READ (also added F_WEBAPI_CREATE, F_WEBAPI_UPDATE, F_WEBAPI_DELETE ... not currently in use)
added:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/action/
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/action/NoAction.java
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/IndexController.java
dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml
dhis-2/dhis-web/dhis-web-api/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml
--
lp:dhis2
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to OpenID transaction in progress