Merge authors:
Bob Jolliffe bobjolliffe@gmail.com
Morten Olav Hansen (mortenoh)
revision-diff.txt (184 KB)
···
------------------------------------------------------------
revno: 5301 [merge]
committer: Morten Olav Hansen <mortenoh@gmail.com>
branch nick: dhis2
timestamp: Tue 2011-12-06 12:37:04 +0100
message:
merge with dxf2: namespace is now present correctly, json has null-values stripped + other fixes
removed:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Resource.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Resources.java
added:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/codelist/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/concept/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataarchive/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/databrowser/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datalock/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamerge/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataprune/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dbms/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/gis/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/hierarchy/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/maintenance/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapgeneration/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/minmax/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/options/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/orgunitdistribution/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientchart/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/pivottable/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programattributevalue/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/source/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/tallysheet/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/useraudit/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/package-info.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/version/package-info.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resource.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resources.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/package-info.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Charts.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseLinkableObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JsonIdentifiableObjectSerializer.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JsonNameableObjectSerializer.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ResourceController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebLinkPopulatorListener.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/ExtendedMappingJacksonView.java
--
lp:dhis2
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to OpenID transaction in progress