dhis2-documenters team mailing list archive
-
dhis2-documenters team
-
Mailing list archive
-
Message #01219
[dhis2/dhis2-docs] 7dc139: Merge branch 'master' into docinprogress
Branch: refs/heads/SmsDocs
Home: https://github.com/dhis2/dhis2-docs
Commit: 7dc139c0ce195cf38821d8b53616a060c8d8499f
https://github.com/dhis2/dhis2-docs/commit/7dc139c0ce195cf38821d8b53616a060c8d8499f
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-29 (Wed, 29 Jun 2016)
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: 2d35a0dd57ad6a174de59ac6be638064a635f34a
https://github.com/dhis2/dhis2-docs/commit/2d35a0dd57ad6a174de59ac6be638064a635f34a
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-29 (Wed, 29 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: f48258e2da2dd49a8b82ffb317bf43b850d35f2d
https://github.com/dhis2/dhis2-docs/commit/f48258e2da2dd49a8b82ffb317bf43b850d35f2d
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-30 (Thu, 30 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
A src/docbkx/en/resources/images/dhis2_mobile_sms/generichttp-configuration.png
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: a4a8014c8ce10856c08bcd466813913ccc2b7924
https://github.com/dhis2/dhis2-docs/commit/a4a8014c8ce10856c08bcd466813913ccc2b7924
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-30 (Thu, 30 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge pull request #76 from dhis2/SmsDocs
Sms docs
Commit: 574127f243484c4e7837823a4074d9bd8f991a13
https://github.com/dhis2/dhis2-docs/commit/574127f243484c4e7837823a4074d9bd8f991a13
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-30 (Thu, 30 Jun 2016)
Changed paths:
M src/docbkx/en/content/maintenance/mtn_attribute.xml
M src/docbkx/en/content/maintenance/mtn_constant.xml
A src/docbkx/en/content/maintenance/mtn_data_element.xml
A src/docbkx/en/content/maintenance/mtn_data_set.xml
A src/docbkx/en/content/maintenance/mtn_indicator.xml
M src/docbkx/en/content/maintenance/mtn_option_set.xml
A src/docbkx/en/content/maintenance/mtn_org_unit.xml
M src/docbkx/en/content/maintenance/mtn_toc.xml
A src/docbkx/en/content/templates/template_feature.xml
M src/docbkx/en/dhis2_user_man_data_administration.xml
R src/docbkx/en/dhis2_user_man_data_elements.xml
R src/docbkx/en/dhis2_user_man_datasets_forms.xml
R src/docbkx/en/dhis2_user_man_indicators.xml
M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
R src/docbkx/en/dhis2_user_man_orgunits.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
M src/docbkx/en/dhis2_user_manual_en.xml
A src/docbkx/en/obsolete_dhis2_user_man_data_elements.xml
A src/docbkx/en/obsolete_dhis2_user_man_datasets_forms.xml
A src/docbkx/en/obsolete_dhis2_user_man_indicators.xml
A src/docbkx/en/obsolete_dhis2_user_man_orgunits.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: 8901b6d602b3ab2bb12e0bfd777f6f412bbffbd4
https://github.com/dhis2/dhis2-docs/commit/8901b6d602b3ab2bb12e0bfd777f6f412bbffbd4
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-30 (Thu, 30 Jun 2016)
Changed paths:
M src/docbkx/en/content/maintenance/mtn_data_element.xml
M src/docbkx/en/content/maintenance/mtn_data_set.xml
A src/docbkx/en/content/maintenance/mtn_features_not_included.xml
M src/docbkx/en/content/maintenance/mtn_toc.xml
R src/docbkx/en/resources/images/datasets/custom_forms_data_elements1.png
A src/docbkx/en/resources/images/datasets/data_set_custom_form_create.png
A src/docbkx/en/resources/images/datasets/old_custom_forms_data_elements1.png
A src/docbkx/en/resources/images/datasets/old_sectionform_grey_field_management.png
A src/docbkx/en/resources/images/datasets/section_form_grey_fields.png
R src/docbkx/en/resources/images/datasets/sectionform_grey_field_management.png
Log Message:
-----------
Mtn app: further updates and edits
Commit: 73492459b4d161af55b9fc00919d9b86e6a0928c
https://github.com/dhis2/dhis2-docs/commit/73492459b4d161af55b9fc00919d9b86e6a0928c
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-30 (Thu, 30 Jun 2016)
Changed paths:
M src/docbkx/en/content/maintenance/mtn_data_element.xml
M src/docbkx/en/content/maintenance/mtn_data_set.xml
A src/docbkx/en/content/maintenance/mtn_features_not_included.xml
M src/docbkx/en/content/maintenance/mtn_toc.xml
R src/docbkx/en/resources/images/datasets/custom_forms_data_elements1.png
A src/docbkx/en/resources/images/datasets/data_set_custom_form_create.png
A src/docbkx/en/resources/images/datasets/old_custom_forms_data_elements1.png
A src/docbkx/en/resources/images/datasets/old_sectionform_grey_field_management.png
A src/docbkx/en/resources/images/datasets/section_form_grey_fields.png
R src/docbkx/en/resources/images/datasets/sectionform_grey_field_management.png
Log Message:
-----------
Merge pull request #78 from dhis2/docinprogress
Mtn app: further updates and edits
Commit: 0710e13b0317d96baf0bd4a04b12b8c892391401
https://github.com/dhis2/dhis2-docs/commit/0710e13b0317d96baf0bd4a04b12b8c892391401
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-30 (Thu, 30 Jun 2016)
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: ab9a8c34d2976cddd2600c0353f6136df72f9e52
https://github.com/dhis2/dhis2-docs/commit/ab9a8c34d2976cddd2600c0353f6136df72f9e52
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-30 (Thu, 30 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_gis.xml
M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
Log Message:
-----------
GIS: minor edits; Usage analytics: minor edits
Commit: 759640ee19938dd68080b0cb74cb3f113c1f3f61
https://github.com/dhis2/dhis2-docs/commit/759640ee19938dd68080b0cb74cb3f113c1f3f61
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-30 (Thu, 30 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_gis.xml
M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
Log Message:
-----------
Merge pull request #80 from dhis2/docinprogress
GIS: minor edits; Usage analytics: minor edits
Commit: 5536e4ca709279418a7cf5b39b4cd48fe38c5f98
https://github.com/dhis2/dhis2-docs/commit/5536e4ca709279418a7cf5b39b4cd48fe38c5f98
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-07-01 (Fri, 01 Jul 2016)
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: 72fac064611650cfdb6fbafaf18a9e3342ea5411
https://github.com/dhis2/dhis2-docs/commit/72fac064611650cfdb6fbafaf18a9e3342ea5411
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-07-01 (Fri, 01 Jul 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_gis.xml
M src/docbkx/en/dhis2_user_man_using_pivot_table.xml
M src/docbkx/en/dhis2_user_man_using_tracker_capture.xml
M src/docbkx/en/resources/images/gis/gis_earth_engine_layer_population.png
A src/docbkx/en/resources/images/gis/old_gis_earth_engine_layer_population.png
Log Message:
-----------
Misc updates for 2.24 release
Commit: 68c382f96f9365481f8ce56d4179961bdb76d6cb
https://github.com/dhis2/dhis2-docs/commit/68c382f96f9365481f8ce56d4179961bdb76d6cb
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-07-01 (Fri, 01 Jul 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_gis.xml
M src/docbkx/en/dhis2_user_man_using_pivot_table.xml
M src/docbkx/en/dhis2_user_man_using_tracker_capture.xml
M src/docbkx/en/resources/images/gis/gis_earth_engine_layer_population.png
A src/docbkx/en/resources/images/gis/old_gis_earth_engine_layer_population.png
Log Message:
-----------
Merge pull request #81 from dhis2/docinprogress
Misc updates for 2.24 release
Commit: 8da54005c1210309c648fdab3fbf5de7401f8f16
https://github.com/dhis2/dhis2-docs/commit/8da54005c1210309c648fdab3fbf5de7401f8f16
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-07-01 (Fri, 01 Jul 2016)
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: 53b9cc49a243a626dbac8253ec9a09650f9dd71f
https://github.com/dhis2/dhis2-docs/commit/53b9cc49a243a626dbac8253ec9a09650f9dd71f
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-07-01 (Fri, 01 Jul 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_tracker_capture.xml
Log Message:
-----------
Tracker capture: updates for 2.24
Commit: 25ff5fa83a5f4483c1c3faddc93c9842ec2b7661
https://github.com/dhis2/dhis2-docs/commit/25ff5fa83a5f4483c1c3faddc93c9842ec2b7661
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-07-01 (Fri, 01 Jul 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_tracker_capture.xml
Log Message:
-----------
Merge pull request #82 from dhis2/docinprogress
Tracker capture: updates for 2.24
Commit: 50866bf1e81236e01c68c97cb4f4b8c2d96f036e
https://github.com/dhis2/dhis2-docs/commit/50866bf1e81236e01c68c97cb4f4b8c2d96f036e
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-07-01 (Fri, 01 Jul 2016)
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: 2029de28b5796bf2d9e526ff25c1943ac29a5c8f
https://github.com/dhis2/dhis2-docs/commit/2029de28b5796bf2d9e526ff25c1943ac29a5c8f
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-07-01 (Fri, 01 Jul 2016)
Changed paths:
M src/docbkx/en/content/maintenance/mtn_data_element.xml
M src/docbkx/en/content/maintenance/mtn_data_set.xml
M src/docbkx/en/content/maintenance/mtn_features_not_included.xml
M src/docbkx/en/content/maintenance/mtn_indicator.xml
M src/docbkx/en/content/maintenance/mtn_option_set.xml
M src/docbkx/en/content/maintenance/mtn_org_unit.xml
M src/docbkx/en/dhis2_user_man_using_tracker_capture.xml
M src/docbkx/en/resources/images/maintainence/indicator_type_create.png
Log Message:
-----------
Misc updates for 2.24
Commit: c1425c998e6e733b13f660c141a5160e67458420
https://github.com/dhis2/dhis2-docs/commit/c1425c998e6e733b13f660c141a5160e67458420
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-07-01 (Fri, 01 Jul 2016)
Changed paths:
M src/docbkx/en/content/maintenance/mtn_data_element.xml
M src/docbkx/en/content/maintenance/mtn_data_set.xml
M src/docbkx/en/content/maintenance/mtn_features_not_included.xml
M src/docbkx/en/content/maintenance/mtn_indicator.xml
M src/docbkx/en/content/maintenance/mtn_option_set.xml
M src/docbkx/en/content/maintenance/mtn_org_unit.xml
M src/docbkx/en/dhis2_user_man_using_tracker_capture.xml
M src/docbkx/en/resources/images/maintainence/indicator_type_create.png
Log Message:
-----------
Merge pull request #84 from dhis2/docinprogress
Misc updates for 2.24
Commit: 7326b689a696da4b8388cf5a705823368b65aeda
https://github.com/dhis2/dhis2-docs/commit/7326b689a696da4b8388cf5a705823368b65aeda
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-07-04 (Mon, 04 Jul 2016)
Changed paths:
M src/docbkx/en/content/maintenance/mtn_data_element.xml
M src/docbkx/en/content/maintenance/mtn_data_set.xml
A src/docbkx/en/content/maintenance/mtn_features_not_included.xml
M src/docbkx/en/content/maintenance/mtn_indicator.xml
M src/docbkx/en/content/maintenance/mtn_option_set.xml
M src/docbkx/en/content/maintenance/mtn_org_unit.xml
M src/docbkx/en/content/maintenance/mtn_toc.xml
M src/docbkx/en/dhis2_user_man_using_gis.xml
M src/docbkx/en/dhis2_user_man_using_pivot_table.xml
M src/docbkx/en/dhis2_user_man_using_tracker_capture.xml
M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
R src/docbkx/en/resources/images/datasets/custom_forms_data_elements1.png
A src/docbkx/en/resources/images/datasets/data_set_custom_form_create.png
A src/docbkx/en/resources/images/datasets/old_custom_forms_data_elements1.png
A src/docbkx/en/resources/images/datasets/old_sectionform_grey_field_management.png
A src/docbkx/en/resources/images/datasets/section_form_grey_fields.png
R src/docbkx/en/resources/images/datasets/sectionform_grey_field_management.png
M src/docbkx/en/resources/images/gis/gis_earth_engine_layer_population.png
A src/docbkx/en/resources/images/gis/old_gis_earth_engine_layer_population.png
M src/docbkx/en/resources/images/maintainence/indicator_type_create.png
Log Message:
-----------
Merge branch 'master' into SmsDocs
Compare: https://github.com/dhis2/dhis2-docs/compare/e4965a87f0e3...7326b689a696
