Viewing all changes in revision 21531.

Committer: Zubair Asghar
Date: 2016-02-11 11:25:34 UTC
mfrom: (21489.1.458 dhis2)
Revision ID: rajazubair.asghar@gmail.com-20160211112534-v75few91kgt4r78n

MWT

files added:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/MergeMode.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/InvalidReference.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatValidation.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleValidation.java

dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/de_validate1.json

dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/de_validate2.json

dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/de_validate3.json

files removed:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/MergeStrategy.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/MissingReference.java

files modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/BaseChart.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/Color.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/ColorSet.java

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

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

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.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/BaseNameableObject.java

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

dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/Constant.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/Dashboard.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalWorkflow.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroup.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroupSet.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventchart/EventChart.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicator.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroup.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSet.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorType.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/Legend.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/LegendSet.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayer.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/Option.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSet.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitLevel.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatService.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSection.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidation.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRule.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleAction.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariable.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipType.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/render/RenderService.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/oauth2/OAuth2Client.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SettingKey.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlView.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroup.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstance.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminder.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translation.java

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

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

dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.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/UserSettingKey.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/userkeyjsonvalue/UserKeyJsonValue.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/userkeyjsonvalue/UserKeyJsonValueService.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/userkeyjsonvalue/UserKeyJsonValueStore.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationViolation.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dimension/DefaultDimensionService.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/render/DefaultRenderService.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/userkeyjsonvalue/DefaultUserKeyJsonValueService.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/userkeyjsonvalue/hibernate/HibernateUserKeyJsonValueStore.java

dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties

dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es.properties

dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/userkeyjsonvalue/hibernate/UserKeyJsonValue.hbm.xml

dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/preheat/PreheatServiceTest.java

dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/render/RenderServiceTest.java

dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserSettingServiceTest.java

dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/userkeyjsonvalue/UserKeyJsonValueStoreTest.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportOptions.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/TrackedEntityInstance.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/gml/DefaultGmlImportService.java

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

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

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

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundle.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleParams.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleService.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java

dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/MergeServiceTest.java

dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleServiceTest.java

dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/DefaultProgramSchedulingManager.java

dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/SendScheduledMessageTask.java

dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/OptionSetController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/UserKeyJsonValueController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/legend/LegendSetController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserController.java

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_es.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/new-event.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app_in_ID.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_es.properties

dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIdentifiableObjects.vm

dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js

dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_es.properties

dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_es.properties

dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_es.properties

dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_es.properties

dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_es.properties

dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties

dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java

dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties

dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_es.properties

dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm

dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js

dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/style/dhis-web-reporting.css

dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_es.properties

expand all

Show diffs side-by-side

added added

removed removed

dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/BaseChart.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/Color.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/ColorSet.java

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

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

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.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/BaseNameableObject.java

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

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

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

dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/Constant.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/Dashboard.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalWorkflow.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroup.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroupSet.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventchart/EventChart.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicator.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroup.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSet.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorType.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/Legend.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/LegendSet.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayer.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/Option.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSet.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitLevel.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/InvalidReference.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/MissingReference.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatService.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatValidation.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSection.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidation.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRule.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleAction.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariable.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipType.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/render/RenderService.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/oauth2/OAuth2Client.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SettingKey.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlView.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroup.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstance.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminder.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translation.java

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

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

dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.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/UserSettingKey.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/userkeyjsonvalue/UserKeyJsonValue.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/userkeyjsonvalue/UserKeyJsonValueService.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/userkeyjsonvalue/UserKeyJsonValueStore.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java

dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationViolation.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dimension/DefaultDimensionService.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/render/DefaultRenderService.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/userkeyjsonvalue/DefaultUserKeyJsonValueService.java

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/userkeyjsonvalue/hibernate/HibernateUserKeyJsonValueStore.java

dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties

dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es.properties

dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/userkeyjsonvalue/hibernate/UserKeyJsonValue.hbm.xml

dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/preheat/PreheatServiceTest.java

dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/render/RenderServiceTest.java

dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserSettingServiceTest.java

dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/userkeyjsonvalue/UserKeyJsonValueStoreTest.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportOptions.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/TrackedEntityInstance.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/gml/DefaultGmlImportService.java

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

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

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

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundle.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleParams.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleService.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleValidation.java

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java

dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/MergeServiceTest.java

dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/objectbundle/ObjectBundleServiceTest.java

dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/de_validate1.json

dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/de_validate2.json

dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/de_validate3.json

dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/DefaultProgramSchedulingManager.java

dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/SendScheduledMessageTask.java

dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/OptionSetController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/UserKeyJsonValueController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/legend/LegendSetController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapController.java

dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserController.java

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_es.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/new-event.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app_in_ID.properties

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css

dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_es.properties

dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIdentifiableObjects.vm

dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js

dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_es.properties

dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_es.properties

dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_es.properties

dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_es.properties

dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_es.properties

dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties

dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java

dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties

dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_es.properties

dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm

dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js

dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/style/dhis-web-reporting.css

dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_es.properties

Older »

~dhis2-devs-core/dhis2/dhis2-sms

Viewing all changes in revision 21531.