← Back to branch summary

~dhis2-devs-core/dhis2/ebola

~dhis2-devs-core/dhis2/ebola

Viewing all changes in revision 16926.

Committer: Abyot Asalefew Gizaw
Date: 2015-01-02 14:39:01 UTC
mfrom: (16797.1.1036 dhis2)
Revision ID: abyota@gmail.com-20150102143901-hm8dy7j83t8rfadl

merge with trunk

files modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericStore.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroupAccess.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java

dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java

dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserAction.java

dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java

dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm

Show diffs side-by-side

added added

removed removed

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericStore.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroupAccess.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java

dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java

dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserAction.java

dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java

dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm

Older »