Merge lp:~sis-ma/dhis2/SISMA-84 into lp:dhis2
Status: | Merged |
---|---|
Merged at revision: | 12354 |
Proposed branch: | lp:~sis-ma/dhis2/SISMA-84 |
Merge into: | lp:dhis2 |
Diff against target: |
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) |
To merge this branch: | bzr merge lp:~sis-ma/dhis2/SISMA-84 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
DHIS 2 core developers | Pending | ||
Review via email: mp+186329@code.launchpad.net |
Description of the change
Changes for allowing user metadata import.
dhis-2\
dhis-2\
dhis-2\
dhis-2\
dhis-2\
dhis-2\
dhis-2\
dhis-2\