[Dhis2-devs] DataElement of type DateTime
Hello Lars, While creating an event, we want to capture arrival DateTime and Discharge DateTime as 2 different fields to calculate the duration of stay. And hence, our requirement is to have a dataElement of type 'DateTime'. Can we expect this to be incorporated in DHIS anytime soon? -- Regards, Mansi Singhal ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19110: ProgramRuleActionType, added new option for hiding program stage section. ProgramRuleAction, adde...
revno: 19110
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Fri 2015-05-08 15:46:50 +0200
message:
ProgramRuleActionType, added new option for hiding program stage section.
ProgramRuleAction, added association to ProgramStageSection in order to support
the action of hiding sections.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleAction.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleActionType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariable.java
dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/programrule/hibernate/ProgramRuleAction.hbm.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleAction.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleAction.java 2015-04-28 13:03:32 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleAction.java 2015-05-08 13:46:50 +
@@ -36,6 +36,7 @@
import org.hisp.dhis.common.view.DimensionalView;
import org.hisp.dhis.common.view.ExportView;
import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.program.ProgramStageSection;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonView;
@@ -88,18 +89,29 @@
private ProgramRuleActionType programRuleActionType;
/**
- * The dataelement that is affected by the ruleAction.
- * Used for
- * hidefield
- * showwarning
- * showerror
+ * The data element that is affected by the rule action.
+ * Used for:
+ *
+ *
+ * hidefield
+ * showwarning
+ * showerror
+ *
*/
private DataElement dataElement;
/**
+ * The program stage section that is affected by the rule action.
+ */
+private ProgramStageSection programStageSection;
+
+/**
* Used to determine which widget to display data for the two action types:
- * displaytext
- * displaykeydata
+ *
+ *
+ * displaytext
+ * displaykeydata
+ *
*/
private String location;
@@ -178,6 +190,19 @@
}
@JsonProperty
+@JsonSerialize( as = BaseIdentifiableObject.class )
+@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+public ProgramStageSection getProgramStageSection()
+{
+return programStageSection;
+}
+
+public void setProgramStageSection( ProgramStageSection programStageSection )
+{
+this.programStageSection = programStageSection;
+}
+
+@JsonProperty
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getLocation()
{
@@ -227,6 +252,7 @@
programRule = programRuleAction.getProgramRule();
programRuleActionType = programRuleAction.getProgramRuleActionType();
dataElement = programRuleAction.getDataElement();
+programStageSection = programRuleAction.getProgramStageSection();
location = programRuleAction.getLocation();
content = programRuleAction.getContent();
data = programRuleAction.getData();
@@ -236,6 +262,7 @@
programRule = programRuleAction.getProgramRule() == null ? programRule : programRuleAction.getProgramRule();
programRuleActionType = programRuleAction.getProgramRuleActionType() == null ? programRuleActionType : programRuleAction.getProgramRuleActionType();
dataElement = programRuleAction.getDataElement() == null ? dataElement : programRuleAction.getDataElement();
+programStageSection = programRuleAction.getProgramStageSection() == null ? programStageSection : programRuleAction.getProgramStageSection();
location = programRuleAction.getLocation() == null ? location : programRuleAction.getLocation();
content = programRuleAction.getContent() == null ? content : programRuleAction.getContent();
data = programRuleAction.getData() == null ? data : programRuleAction.getData();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleActionType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleActionType.java 2015-03-13 08:24:36 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleActionType.java 2015-05-08 13:46:50 +
@@ -35,6 +35,7 @@
DISPLAYTEXT( "displaytext" ),
DISPLAYKEYVALUEPAIR( "displaykeyvaluepair" ),
HIDEFIELD( "hidefield" ),
+HIDESECTION( "hidesection" ),
ASSIGNVA
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19111: bugfix in relationship; added missing gis icon
revno: 19111
committer: Abyot Asalefew Gizaw
branch nick: dhis2
timestamp: Fri 2015-05-08 20:38:58 +0200
message:
bugfix in relationship; added missing gis icon
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.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/relationship/relationship-controller.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-04-20 11:29:12 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-05-08 18:38:58 +
@@ -73,13 +73,14 @@
-
+
+
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2015-04-20 11:29:12 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2015-05-08 18:38:58 +
@@ -39,7 +39,7 @@
-{{'latitude'| translate}}
+{{'latitude'| translate}}
-{{'latitude'| translate}}
+{{'latitude'| translate}}
-{{'longitude'| translate}}
+{{'longitude'| translate}}
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19112: bug fix in gis zoomin/out
revno: 19112
committer: Abyot Asalefew Gizaw
branch nick: dhis2
timestamp: Fri 2015-05-08 21:23:53 +0200
message:
bug fix in gis zoomin/out
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-05-08 18:38:58 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-05-08 19:23:53 +
@@ -11,7 +11,7 @@
window.google = null;
-https://maps.google.com/maps/api/js?sensor=false";>
+https://maps.google.com/maps/api/js?v=3.19";>
@@ -73,14 +73,13 @@
-
+
-
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html 2015-04-28 16:02:56 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html 2015-05-08 19:23:53 +
@@ -12,7 +12,7 @@
window.google = null;
-https://maps.google.com/maps/api/js?sensor=false";>
+https://maps.google.com/maps/api/js?v=3.19";>
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js 2015-03-31 12:18:31 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js 2015-05-08 19:23:53 +
@@ -358,7 +358,7 @@
featureStyle = {
strokeWeight: 2,
strokeOpacity: 0.4,
-fillOpacity: 0.4,
+fillOpacity: 0.2,
fillColor: '#99cc99'
};
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19113: ER option set fix.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 19113 [merge]
committer: Jan Henrik Overland
branch nick: dhis2
timestamp: Fri 2015-05-08 21:32:08 +0200
message:
ER option set fix.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-05-08 00:20:01 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-05-08 19:21:23 +
@@ -7027,7 +7027,7 @@
var optionSetHeaders = [];
for (var i = 0; i < xResponse.headers.length; i++) {
-if (Ext.isString(xResponse.headers[i].optionSet)) {
+if (xResponse.headers[i].optionSet) {
optionSetHeaders.push(xResponse.headers[i]);
}
}
@@ -7055,10 +7055,12 @@
// execute
for (var i = 0, header, optionSetId, dataElementId; i < optionSetHeaders.length; i++) {
header = optionSetHeaders[i];
-optionSetId = header.optionSet;
+optionSetIds = Ext.Array.from(header.optionSet);
dataElementId = header.name;
-getOptions(optionSetId, dataElementId);
+for (var j = 0; j < optionSetIds.length; j++) {
+getOptions(optionSetIds[j], dataElementId);
+}
}
}
else {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2015-05-07 15:52:11 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2015-05-08 19:24:50 +
@@ -6672,7 +6672,7 @@
var optionSetHeaders = [];
for (var i = 0; i < xResponse.headers.length; i++) {
-if (Ext.isString(xResponse.headers[i].optionSet)) {
+if (xResponse.headers[i].optionSet) {
optionSetHeaders.push(xResponse.headers[i]);
}
}
@@ -6700,10 +6700,12 @@
// execute
for (var i = 0, header, optionSetId, dataElementId; i < optionSetHeaders.length; i++) {
header = optionSetHeaders[i];
-optionSetId = header.optionSet;
+optionSetIds = Ext.Array.from(header.optionSet);
dataElementId = header.name;
-getOptions(optionSetId, dataElementId);
+for (var j = 0; j < optionSetIds.length; j++) {
+getOptions(optionSetIds[j], dataElementId);
+}
}
}
else {
@@ -6712,7 +6714,7 @@
};
success = function() {
-
+
// timing
ns.app.dateTotal = new Date();
@@ -6762,7 +6764,7 @@
ns.app.centerRegion.removeAll(true);
ns.app.centerRegion.add(chart);
-success();
+success();
};
getSXLayout = function() {
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19114: minor
revno: 19114
committer: Abyot Asalefew Gizaw
branch nick: dhis2
timestamp: Fri 2015-05-08 21:45:51 +0200
message:
minor
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/coordinatecapture/map.html
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/coordinatecapture/map.html'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/coordinatecapture/map.html 2015-03-05 15:48:50 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/coordinatecapture/map.html 2015-05-08 19:45:51 +
@@ -11,5 +11,5 @@
{{'capture'| translate}}
-{{'close'| translate}}
+{{'cancel'| translate}}
\ No newline at end of file
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19115: minor: back button to tei list in relationship assignment
revno: 19115
committer: Abyot Asalefew Gizaw
branch nick: dhis2
timestamp: Fri 2015-05-08 22:12:05 +0200
message:
minor: back button to tei list in relationship assignment
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html 2015-04-09 12:36:37 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html 2015-05-08 20:12:05 +
@@ -47,6 +47,7 @@
{{relationship.selected.bIsToA}}
+{{'back' | translate}}
@@ -56,7 +57,7 @@
{{teiForRelationship[gridColumn.id]}}
-
+
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js 2015-05-08 18:38:58 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js 2015-05-08 20:12:05 +
@@ -493,6 +493,12 @@
$rootScope.showAddRelationshipDiv = !$rootScope.showAddRelationshipDiv;
};
+
+$scope.back = function(){
+$scope.teiForRelationship = null;
+$rootScope.showAddRelationshipDiv = !$rootScope.showAddRelationshipDiv;
+};
+
$scope.addRelationship = function(){
if($scope.selectedTei && $scope.teiForRelationship && $scope.relationship.selected){
var tei = angular.copy($scope.selectedTei);
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19116: Minor
revno: 19116 committer: Lars Helge Overland branch nick: dhis2 timestamp: Fri 2015-05-08 22:26:13 +0200 message: Minor modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2015-04-24 09:45:25 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2015-05-08 20:26:13 + @@ -112,6 +112,7 @@ category_option_combo_id_not_numeric=Category option combo identifier must be a number data_element_does_not_exist=Identifier does not reference a data element category_option_combo_does_not_exist=Identifier does not reference a category option combo +org_unit_group_does_not_exist=Organisation unit group does not exist expression_not_well_formed=Expression is not well formed invalid_indicator_denominators=Invalid indicator denominators invalid_indicator_numerators=Invalid indicator numerators === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2015-04-07 09:42:13 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2015-05-08 20:26:13 + @@ -126,4 +126,4 @@ infrastructural_indicators=Infrastructural indicators cors_whitelist=CORS Whitelist require_authority_to_add_to_view_object_lists=Require authority to add to view object lists -example=Example \ No newline at end of file +for_example=For example \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm 2015-03-30 14:50:33 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm 2015-05-08 20:26:13 + @@ -158,7 +158,7 @@ $i18n.getString( "server_base_url" ) -https://apps.dhis2.org/demo"; value="$!keyInstanceBaseUrl"/> +https://apps.dhis2.org/demo"; value="$!keyInstanceBaseUrl"/> $i18n.getString( "google_analytics_ua_key" ) ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19117: Set versions for release to 2.19
revno: 19117 committer: Lars Helge Overland branch nick: dhis2 timestamp: Fri 2015-05-08 22:42:54 +0200 message: Set versions for release to 2.19 modified: dhis-2/dhis-api/pom.xml dhis-2/dhis-services/dhis-service-administration/pom.xml dhis-2/dhis-services/dhis-service-analytics/pom.xml dhis-2/dhis-services/dhis-service-core/pom.xml dhis-2/dhis-services/dhis-service-datamart-default/pom.xml dhis-2/dhis-services/dhis-service-dxf2/pom.xml dhis-2/dhis-services/dhis-service-eventreporting/pom.xml dhis-2/dhis-services/dhis-service-importexport/pom.xml dhis-2/dhis-services/dhis-service-mobile/pom.xml dhis-2/dhis-services/dhis-service-reporting/pom.xml dhis-2/dhis-services/dhis-service-sms/pom.xml dhis-2/dhis-services/dhis-service-tracker/pom.xml dhis-2/dhis-services/pom.xml dhis-2/dhis-support/dhis-support-external/pom.xml dhis-2/dhis-support/dhis-support-hibernate/pom.xml dhis-2/dhis-support/dhis-support-jdbc/pom.xml dhis-2/dhis-support/dhis-support-system/pom.xml dhis-2/dhis-support/dhis-support-test/pom.xml dhis-2/dhis-support/pom.xml dhis-2/dhis-web/dhis-web-api-mobile/pom.xml dhis-2/dhis-web/dhis-web-api/pom.xml dhis-2/dhis-web/dhis-web-apps/pom.xml dhis-2/dhis-web/dhis-web-caseentry/pom.xml dhis-2/dhis-web/dhis-web-commons-resources/pom.xml dhis-2/dhis-web/dhis-web-commons/pom.xml dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml dhis-2/dhis-web/dhis-web-dataentry/pom.xml dhis-2/dhis-web/dhis-web-importexport/pom.xml dhis-2/dhis-web/dhis-web-light/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml dhis-2/dhis-web/dhis-web-maintenance/pom.xml dhis-2/dhis-web/dhis-web-mobile/pom.xml dhis-2/dhis-web/dhis-web-ohie/pom.xml dhis-2/dhis-web/dhis-web-portal/pom.xml dhis-2/dhis-web/dhis-web-reporting/pom.xml dhis-2/dhis-web/dhis-web-sms/pom.xml dhis-2/dhis-web/dhis-web-validationrule/pom.xml dhis-2/dhis-web/pom.xml dhis-2/pom.xml -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-api/pom.xml' --- dhis-2/dhis-api/pom.xml 2015-02-19 09:18:17 + +++ dhis-2/dhis-api/pom.xml 2015-05-08 20:42:54 + @@ -7,7 +7,7 @@ org.hisp.dhis dhis -2.19-SNAPSHOT +2.19 dhis-api === modified file 'dhis-2/dhis-services/dhis-service-administration/pom.xml' --- dhis-2/dhis-services/dhis-service-administration/pom.xml 2015-03-31 12:36:25 + +++ dhis-2/dhis-services/dhis-service-administration/pom.xml 2015-05-08 20:42:54 + @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services -2.19-SNAPSHOT +2.19 dhis-service-administration === modified file 'dhis-2/dhis-services/dhis-service-analytics/pom.xml' --- dhis-2/dhis-services/dhis-service-analytics/pom.xml 2015-03-06 11:35:01 + +++ dhis-2/dhis-services/dhis-service-analytics/pom.xml 2015-05-08 20:42:54 + @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services -2.19-SNAPSHOT +2.19 dhis-service-analytics === modified file 'dhis-2/dhis-services/dhis-service-core/pom.xml' --- dhis-2/dhis-services/dhis-service-core/pom.xml 2015-03-06 11:35:01 + +++ dhis-2/dhis-services/dhis-service-core/pom.xml 2015-05-08 20:42:54 + @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services -2.19-SNAPSHOT +2.19 dhis-service-core === modified file 'dhis-2/dhis-services/dhis-service-datamart-default/pom.xml' --- dhis-2/dhis-services/dhis-service-datamart-default/pom.xml 2015-03-06 11:35:01 + +++ dhis-2/dhis-services/dhis-service-datamart-default/pom.xml 2015-05-08 20:42:54 + @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services -2.19-SNAPSHOT +2.19 dhis-service-datamart-default === modified file 'dhis-2/dhis-services/dhis-service-dxf2/pom.xml' --- dhis-2/dhis-services/dhis-service-dxf2/pom.xml 2015-01-23 14:07:46 + +++ dhis-2/dhis-services/dhis-service-dxf2/pom.xml 2015-05-08 20:42:54 + @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services -2.19-SNAPSHOT +2.19 dhis-service-dxf2 === modified file 'dhis-2/dhis-services/dhis-serv
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19118: Minor
revno: 19118 committer: Lars Helge Overland branch nick: dhis2 timestamp: Fri 2015-05-08 22:43:38 +0200 message: Minor modified: dhis-2/pom.xml -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/pom.xml' --- dhis-2/pom.xml 2015-05-08 20:42:54 + +++ dhis-2/pom.xml 2015-05-08 20:43:38 + @@ -30,7 +30,6 @@ dhis-api dhis-services dhis-support -dhis-web ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19119: Set versions to 2.20-SNAPSHOT
revno: 19119 committer: Lars Helge Overland branch nick: dhis2 timestamp: Fri 2015-05-08 22:54:18 +0200 message: Set versions to 2.20-SNAPSHOT modified: dhis-2/dhis-api/pom.xml dhis-2/dhis-services/dhis-service-administration/pom.xml dhis-2/dhis-services/dhis-service-analytics/pom.xml dhis-2/dhis-services/dhis-service-core/pom.xml dhis-2/dhis-services/dhis-service-datamart-default/pom.xml dhis-2/dhis-services/dhis-service-dxf2/pom.xml dhis-2/dhis-services/dhis-service-eventreporting/pom.xml dhis-2/dhis-services/dhis-service-importexport/pom.xml dhis-2/dhis-services/dhis-service-mobile/pom.xml dhis-2/dhis-services/dhis-service-reporting/pom.xml dhis-2/dhis-services/dhis-service-sms/pom.xml dhis-2/dhis-services/dhis-service-tracker/pom.xml dhis-2/dhis-services/pom.xml dhis-2/dhis-support/dhis-support-external/pom.xml dhis-2/dhis-support/dhis-support-hibernate/pom.xml dhis-2/dhis-support/dhis-support-jdbc/pom.xml dhis-2/dhis-support/dhis-support-system/pom.xml dhis-2/dhis-support/dhis-support-test/pom.xml dhis-2/dhis-support/pom.xml dhis-2/dhis-web/dhis-web-api-mobile/pom.xml dhis-2/dhis-web/dhis-web-api/pom.xml dhis-2/dhis-web/dhis-web-apps/pom.xml dhis-2/dhis-web/dhis-web-caseentry/pom.xml dhis-2/dhis-web/dhis-web-commons-resources/pom.xml dhis-2/dhis-web/dhis-web-commons/pom.xml dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml dhis-2/dhis-web/dhis-web-dataentry/pom.xml dhis-2/dhis-web/dhis-web-importexport/pom.xml dhis-2/dhis-web/dhis-web-light/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/pom.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml dhis-2/dhis-web/dhis-web-maintenance/pom.xml dhis-2/dhis-web/dhis-web-mobile/pom.xml dhis-2/dhis-web/dhis-web-ohie/pom.xml dhis-2/dhis-web/dhis-web-portal/pom.xml dhis-2/dhis-web/dhis-web-reporting/pom.xml dhis-2/dhis-web/dhis-web-sms/pom.xml dhis-2/dhis-web/dhis-web-validationrule/pom.xml dhis-2/dhis-web/pom.xml dhis-2/pom.xml -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-api/pom.xml' --- dhis-2/dhis-api/pom.xml 2015-05-08 20:42:54 + +++ dhis-2/dhis-api/pom.xml 2015-05-08 20:54:18 + @@ -7,7 +7,7 @@ org.hisp.dhis dhis -2.19 +2.20-SNAPSHOT dhis-api === modified file 'dhis-2/dhis-services/dhis-service-administration/pom.xml' --- dhis-2/dhis-services/dhis-service-administration/pom.xml 2015-05-08 20:42:54 + +++ dhis-2/dhis-services/dhis-service-administration/pom.xml 2015-05-08 20:54:18 + @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services -2.19 +2.20-SNAPSHOT dhis-service-administration === modified file 'dhis-2/dhis-services/dhis-service-analytics/pom.xml' --- dhis-2/dhis-services/dhis-service-analytics/pom.xml 2015-05-08 20:42:54 + +++ dhis-2/dhis-services/dhis-service-analytics/pom.xml 2015-05-08 20:54:18 + @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services -2.19 +2.20-SNAPSHOT dhis-service-analytics === modified file 'dhis-2/dhis-services/dhis-service-core/pom.xml' --- dhis-2/dhis-services/dhis-service-core/pom.xml 2015-05-08 20:42:54 + +++ dhis-2/dhis-services/dhis-service-core/pom.xml 2015-05-08 20:54:18 + @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services -2.19 +2.20-SNAPSHOT dhis-service-core === modified file 'dhis-2/dhis-services/dhis-service-datamart-default/pom.xml' --- dhis-2/dhis-services/dhis-service-datamart-default/pom.xml 2015-05-08 20:42:54 + +++ dhis-2/dhis-services/dhis-service-datamart-default/pom.xml 2015-05-08 20:54:18 + @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services -2.19 +2.20-SNAPSHOT dhis-service-datamart-default === modified file 'dhis-2/dhis-services/dhis-service-dxf2/pom.xml' --- dhis-2/dhis-services/dhis-service-dxf2/pom.xml 2015-05-08 20:42:54 + +++ dhis-2/dhis-services/dhis-service-dxf2/pom.xml 2015-05-08 20:54:18 + @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services -2.19 +2.20-SNAPSHOT dhis-service-dxf2 === modified file 'dhis-2/dhis-services/dhis-service
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 19120: Minor fix, version was not set in pom-full.xml
revno: 19120 committer: Morten Olav Hansen branch nick: dhis2 timestamp: Sat 2015-05-09 10:14:51 +0700 message: Minor fix, version was not set in pom-full.xml modified: dhis-2/pom-full.xml -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/pom-full.xml' --- dhis-2/pom-full.xml 2015-01-23 14:07:46 + +++ dhis-2/pom-full.xml 2015-05-09 03:14:51 + @@ -7,7 +7,7 @@ org.hisp.dhis dhis - 2.19-SNAPSHOT + 2.20-SNAPSHOT . ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
