lp:~sis-ma/dhis2/SISMA-84

Branch merges

Propose for merging

Merged into lp:dhis2 at revision 12354

DHIS 2 core developers: Pending requested 2013-09-18

Diff: 232 lines (+60/-7)

8 files modified

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java (+5/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java (+1/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java (+10/-3)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java (+3/-1)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserCredentials.hbm.xml (+1/-1)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java (+2/-2)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java (+37/-0)
dhis-2/pom.xml (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

12140. By Leandro Soares on 2013-09-30

Merge from trunk

12139. By Leandro Soares on 2013-09-18

Update to latest revision

12138. By Leandro Soares on 2013-09-18

Update to new revision

12137. By Leandro Soares on 2013-09-18

Merged User import functionality into 2.13 trunk.
Fixed condition on MapView

12136. By Morten Olav Hansen on 2013-09-18

Minor fixes

12135. By Morten Olav Hansen on 2013-09-18

enrollment service, wip. controller can now query on program, orgUnit, person

12134. By Lars Helge Øverland on 2013-09-18

Data entry, fixed bug, grey fields in sections not working properly. The solution for data locking messed up greyed fields, using readonly attribute for data locking for now.

12133. By Lars Helge Øverland on 2013-09-18

Minor

12132. By Thu Tran on 2013-09-18

Rename method enrollmentPatient to enrollPatient

12131. By Nguyen Kim Lai on 2013-09-18

clean code