dhis2-documenters team mailing list archive
-
dhis2-documenters team
-
Mailing list archive
-
Message #01203
[dhis2/dhis2-docs] 7dc139: Merge branch 'master' into docinprogress
Branch: refs/heads/master
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: 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
Compare: https://github.com/dhis2/dhis2-docs/compare/a4a8014c8ce1...73492459b4d1