← Back to team overview

dhis2-documenters team mailing list archive

  1. dhis2-documenters team
  2. Mailing list archive
  3. Message #01202

[dhis2/dhis2-docs] a6929f: Merge pull request #68 from dhis2/docinprogress

  Thread Previous • Date Previous • • Thread Next 
  Branch: refs/heads/docinprogress
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: a6929f47190c7b41c158fc8c399e58d4bb93b762
      https://github.com/dhis2/dhis2-docs/commit/a6929f47190c7b41c158fc8c399e58d4bb93b762
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_dashboard.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml

  Log Message:
  -----------
  Merge pull request #68 from dhis2/docinprogress

Merge latest updates on docinprogress into master


  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: dc1fa29c5e2294a52fc83a046f72e782c21847e6
      https://github.com/dhis2/dhis2-docs/commit/dc1fa29c5e2294a52fc83a046f72e782c21847e6
  Author: Lars Helge Overland <larshelge@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Predictors


  Commit: b3d3f60945082e06ebec7aef6209696702ed74fc
      https://github.com/dhis2/dhis2-docs/commit/b3d3f60945082e06ebec7aef6209696702ed74fc
  Author: Lars Helge Øverland <larshelge@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    A src/docbkx/en/content/maintenance/mtn_attribute.xml
    M src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
    A src/docbkx/en/content/maintenance/mtn_constant.xml
    A src/docbkx/en/content/maintenance/mtn_option_set.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml
    M src/docbkx/en/dhis2_user_man_dashboard.xml
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    A src/docbkx/en/resources/images/datasets/data_set_create.png
    R src/docbkx/en/resources/images/datasets/dataset-management.png
    A src/docbkx/en/resources/images/datasets/old_dataset-management.png
    M src/docbkx/en/resources/images/maintainence/categories_dataset_attributes.png
    A src/docbkx/en/resources/images/maintainence/old_categories_dataset_attributes.png

  Log Message:
  -----------
  Merge branch 'master' into lars-docs


  Commit: 6165cfa020e192871623d28eef4d991be8e58cd1
      https://github.com/dhis2/dhis2-docs/commit/6165cfa020e192871623d28eef4d991be8e58cd1
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    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
    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_manual_en.xml

  Log Message:
  -----------
  Mtn app: Test of new linking structure


  Commit: 09bd8f846129eeb186e668f9d05b350840c3ee6d
      https://github.com/dhis2/dhis2-docs/commit/09bd8f846129eeb186e668f9d05b350840c3ee6d
  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 pull request #69 from dhis2/lars-docs

Predictors


  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: 4ef6d10c83fb90fc58b37a809bb9dca8ec778b73
      https://github.com/dhis2/dhis2-docs/commit/4ef6d10c83fb90fc58b37a809bb9dca8ec778b73
  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 mtn-restructure


  Commit: 19f8233bdbf4b83704de18a08368656a5d645f47
      https://github.com/dhis2/dhis2-docs/commit/19f8233bdbf4b83704de18a08368656a5d645f47
  Author: zubaira <zubair@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 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:
  -----------
  GenericHttpGateway docs updated


  Commit: fb7029f61c9df0ac5d3bf6775e645d414f2b1c6b
      https://github.com/dhis2/dhis2-docs/commit/fb7029f61c9df0ac5d3bf6775e645d414f2b1c6b
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M src/docbkx/en/content/maintenance/mtn_toc.xml

  Log Message:
  -----------
  Man app: new structure - new test build


  Commit: c43f1328946a14c75ac4a9e4b079ebdfe745b7d6
      https://github.com/dhis2/dhis2-docs/commit/c43f1328946a14c75ac4a9e4b079ebdfe745b7d6
  Author: zubaira <zubair@xxxxxxxxx>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_dashboard.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_using_gis.xml
    M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    A src/docbkx/en/resources/images/gis/gis_earth_engine_layer_population.png
    A src/docbkx/en/resources/images/gis/gis_place_search.png
    A src/docbkx/en/resources/images/maintainence/create_data_element.png
    R src/docbkx/en/resources/images/maintainence/data_element_main2.png
    A src/docbkx/en/resources/images/maintainence/obsolete_data_element_main2.png
    A src/docbkx/en/resources/images/orgunits/create_new_orgunit.png
    R src/docbkx/en/resources/images/orgunits/editing_orgunits_new.png
    A src/docbkx/en/resources/images/orgunits/editing_orgunits_new_old.png

  Log Message:
  -----------
  Merge branch 'SmsDocs' of github.com:dhis2/dhis2-docs into SmsDocs


  Commit: 7caedfc6badb48582d3f6a517deaef8568da0f6d
      https://github.com/dhis2/dhis2-docs/commit/7caedfc6badb48582d3f6a517deaef8568da0f6d
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  translation API docs, wip


  Commit: 4feca59c2a5a6222a830ddc1154a2f52311616cf
      https://github.com/dhis2/dhis2-docs/commit/4feca59c2a5a6222a830ddc1154a2f52311616cf
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    A src/docbkx/en/content/maintenance/mtn_attribute.xml
    M src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
    A src/docbkx/en/content/maintenance/mtn_constant.xml
    A src/docbkx/en/content/maintenance/mtn_option_set.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml
    M src/docbkx/en/dhis2_user_man_apps.xml
    M src/docbkx/en/dhis2_user_man_dashboard.xml
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_program_rules.xml
    M src/docbkx/en/dhis2_user_man_tracker.xml
    M src/docbkx/en/dhis2_user_man_using_gis.xml
    M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    A src/docbkx/en/resources/images/datasets/data_set_create.png
    R src/docbkx/en/resources/images/datasets/dataset-management.png
    A src/docbkx/en/resources/images/datasets/old_dataset-management.png
    M src/docbkx/en/resources/images/gis/gis_earth_engine_layer_population.png
    R src/docbkx/en/resources/images/maintainence/add_new_constant.PNG
    R src/docbkx/en/resources/images/maintainence/add_new_dynamic_attribute.png
    A src/docbkx/en/resources/images/maintainence/attribute_create.png
    M src/docbkx/en/resources/images/maintainence/categories_dataset_attributes.png
    A src/docbkx/en/resources/images/maintainence/constant_create.png
    R src/docbkx/en/resources/images/maintainence/indicator_add.png
    A src/docbkx/en/resources/images/maintainence/indicator_create.png
    A src/docbkx/en/resources/images/maintainence/indicator_group_create.png
    A src/docbkx/en/resources/images/maintainence/indicator_group_set_create.png
    R src/docbkx/en/resources/images/maintainence/indicator_group_sets.png
    R src/docbkx/en/resources/images/maintainence/indicator_maintenance_main.png
    R src/docbkx/en/resources/images/maintainence/indicator_type.png
    A src/docbkx/en/resources/images/maintainence/indicator_type_create.png
    A src/docbkx/en/resources/images/maintainence/old_add_new_constant.PNG
    A src/docbkx/en/resources/images/maintainence/old_add_new_dynamic_attribute.png
    A src/docbkx/en/resources/images/maintainence/old_categories_dataset_attributes.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_add.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_group_sets.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_maintenance_main.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_type.png
    A src/docbkx/en/resources/images/maintainence/old_option_sets.png
    A src/docbkx/en/resources/images/maintainence/option_set_create.png
    R src/docbkx/en/resources/images/maintainence/option_sets.png
    A src/docbkx/en/resources/images/program_rules/program-rule-show-error-on-completion-action.png
    A src/docbkx/en/resources/images/program_rules/program-rule-show-warning-on-completion-action.png
    M src/docbkx/en/resources/images/program_rules/program-rule-source-field.png
    M src/docbkx/en/resources/images/usage_analytics/usage_analytics_interface.png

  Log Message:
  -----------
  Merge branch 'master' into SmsDocs


  Commit: c44821a9620d514d08da19c0ab415220a4f486cb
      https://github.com/dhis2/dhis2-docs/commit/c44821a9620d514d08da19c0ab415220a4f486cb
  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

  Log Message:
  -----------
  Merge branch 'master' into mtn-restructure


  Commit: 9a6b640b2d63991ac86b92278ac60784218d379d
      https://github.com/dhis2/dhis2-docs/commit/9a6b640b2d63991ac86b92278ac60784218d379d
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  finished translation API docs


  Commit: 6dfc898d0c99a1c3faa823ececaf436aadf2cd11
      https://github.com/dhis2/dhis2-docs/commit/6dfc898d0c99a1c3faa823ececaf436aadf2cd11
  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

  Log Message:
  -----------
  Merge branch 'master' into SmsDocs


  Commit: 2e2b9c39cabc25ecd93caddfa195aeca0df4b25d
      https://github.com/dhis2/dhis2-docs/commit/2e2b9c39cabc25ecd93caddfa195aeca0df4b25d
  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

  Log Message:
  -----------
  Merge branch 'master' into mtn-restructure


  Commit: 2793ac7912e42e8b024f7cf5cb00bff1b13db7fe
      https://github.com/dhis2/dhis2-docs/commit/2793ac7912e42e8b024f7cf5cb00bff1b13db7fe
  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 pull request #72 from dhis2/SmsDocs

Sms docs


  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: 042461abaa8686b9e9744d0bf1a88ccf3564ce9a
      https://github.com/dhis2/dhis2-docs/commit/042461abaa8686b9e9744d0bf1a88ccf3564ce9a
  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 mtn-restructure


  Commit: c26f92d0cab42960c62afa2eb97f0a9efc55366f
      https://github.com/dhis2/dhis2-docs/commit/c26f92d0cab42960c62afa2eb97f0a9efc55366f
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    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
    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_manual_en.xml

  Log Message:
  -----------
  Merge pull request #73 from dhis2/mtn-restructure

New test to merge mtn structure


  Commit: 70d14697ca1dcb4e0780ce275f3b0f0036227088
      https://github.com/dhis2/dhis2-docs/commit/70d14697ca1dcb4e0780ce275f3b0f0036227088
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Log Message:
  -----------
  Merge branch 'master' into mtn-restructure


  Commit: 049bc8d0d6dc7540f4829623d3d43a07cb7ebb1e
      https://github.com/dhis2/dhis2-docs/commit/049bc8d0d6dc7540f4829623d3d43a07cb7ebb1e
  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
    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_indicator.xml
    M src/docbkx/en/content/maintenance/mtn_option_set.xml
    M src/docbkx/en/content/maintenance/mtn_org_unit.xml

  Log Message:
  -----------
  Mtn app new structure- retest of image links


  Commit: f7dbf18ec528e34e7e3b6211df03746ef5ac0a2a
      https://github.com/dhis2/dhis2-docs/commit/f7dbf18ec528e34e7e3b6211df03746ef5ac0a2a
  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
    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_indicator.xml
    M src/docbkx/en/content/maintenance/mtn_option_set.xml
    M src/docbkx/en/content/maintenance/mtn_org_unit.xml

  Log Message:
  -----------
  Merge pull request #74 from dhis2/mtn-restructure

Mtn app new structure - retest of image links


  Commit: 685bcf7a6ef6616e6c794ae3ef1531a3a7dc2935
      https://github.com/dhis2/dhis2-docs/commit/685bcf7a6ef6616e6c794ae3ef1531a3a7dc2935
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Log Message:
  -----------
  Merge branch 'master' into mtn-restructure


  Commit: 9c088abbeac37710b163b7b7ae119f6cde404acb
      https://github.com/dhis2/dhis2-docs/commit/9c088abbeac37710b163b7b7ae119f6cde404acb
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_manual_en.xml

  Log Message:
  -----------
  Man app: new structure remove links to old chapters

Also removed content from Data admin chapter that is now in the
Maintenance section.


  Commit: a164f49a63efd4ccb5eb51126a450bd68a045d15
      https://github.com/dhis2/dhis2-docs/commit/a164f49a63efd4ccb5eb51126a450bd68a045d15
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_manual_en.xml

  Log Message:
  -----------
  Merge pull request #75 from dhis2/mtn-restructure

Mtn app: new structure remove links to old chapters


  Commit: f093b21d36a3d03ebbe341c4e6dc7f305abe8807
      https://github.com/dhis2/dhis2-docs/commit/f093b21d36a3d03ebbe341c4e6dc7f305abe8807
  Author: zubaira <zubair@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:
  -----------
  gateway configuration docs updated


  Commit: ed57e6907aef768e2b5395e468acbebbccdefd04
      https://github.com/dhis2/dhis2-docs/commit/ed57e6907aef768e2b5395e468acbebbccdefd04
  Author: zubaira <zubair@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    A src/docbkx/en/content/maintenance/mtn_attribute.xml
    M src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
    A src/docbkx/en/content/maintenance/mtn_constant.xml
    A src/docbkx/en/content/maintenance/mtn_option_set.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml
    M src/docbkx/en/dhis2_user_man_apps.xml
    M src/docbkx/en/dhis2_user_man_dashboard.xml
    M src/docbkx/en/dhis2_user_man_data_administration.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_datasets_forms.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_program_rules.xml
    M src/docbkx/en/dhis2_user_man_tracker.xml
    M src/docbkx/en/dhis2_user_man_using_gis.xml
    M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    A src/docbkx/en/resources/images/datasets/data_set_create.png
    R src/docbkx/en/resources/images/datasets/dataset-management.png
    A src/docbkx/en/resources/images/datasets/old_dataset-management.png
    M src/docbkx/en/resources/images/gis/gis_earth_engine_layer_population.png
    R src/docbkx/en/resources/images/maintainence/add_new_constant.PNG
    R src/docbkx/en/resources/images/maintainence/add_new_dynamic_attribute.png
    A src/docbkx/en/resources/images/maintainence/attribute_create.png
    M src/docbkx/en/resources/images/maintainence/categories_dataset_attributes.png
    A src/docbkx/en/resources/images/maintainence/constant_create.png
    R src/docbkx/en/resources/images/maintainence/indicator_add.png
    A src/docbkx/en/resources/images/maintainence/indicator_create.png
    A src/docbkx/en/resources/images/maintainence/indicator_group_create.png
    A src/docbkx/en/resources/images/maintainence/indicator_group_set_create.png
    R src/docbkx/en/resources/images/maintainence/indicator_group_sets.png
    R src/docbkx/en/resources/images/maintainence/indicator_maintenance_main.png
    R src/docbkx/en/resources/images/maintainence/indicator_type.png
    A src/docbkx/en/resources/images/maintainence/indicator_type_create.png
    A src/docbkx/en/resources/images/maintainence/old_add_new_constant.PNG
    A src/docbkx/en/resources/images/maintainence/old_add_new_dynamic_attribute.png
    A src/docbkx/en/resources/images/maintainence/old_categories_dataset_attributes.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_add.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_group_sets.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_maintenance_main.png
    A src/docbkx/en/resources/images/maintainence/old_indicator_type.png
    A src/docbkx/en/resources/images/maintainence/old_option_sets.png
    A src/docbkx/en/resources/images/maintainence/option_set_create.png
    R src/docbkx/en/resources/images/maintainence/option_sets.png
    A src/docbkx/en/resources/images/program_rules/program-rule-show-error-on-completion-action.png
    A src/docbkx/en/resources/images/program_rules/program-rule-show-warning-on-completion-action.png
    M src/docbkx/en/resources/images/program_rules/program-rule-source-field.png
    M src/docbkx/en/resources/images/usage_analytics/usage_analytics_interface.png

  Log Message:
  -----------
  gateway configuration docs updated
Merge branch 'SmsDocs' of github.com:dhis2/dhis2-docs into SmsDocs


  Commit: d9b5945c1d591f6f7b51e0ad4adce79b065d5983
      https://github.com/dhis2/dhis2-docs/commit/d9b5945c1d591f6f7b51e0ad4adce79b065d5983
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Log Message:
  -----------
  Merge branch 'master' into mtn-restructure


  Commit: 00a70b38127a3890c78870bf9059d01e7ca5bc0c
      https://github.com/dhis2/dhis2-docs/commit/00a70b38127a3890c78870bf9059d01e7ca5bc0c
  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
    M src/docbkx/en/dhis2_user_manual_en.xml

  Log Message:
  -----------
  Merge branch 'master' into SmsDocs


  Commit: 8a1c29b6eec78391828708598fe7ca488f912750
      https://github.com/dhis2/dhis2-docs/commit/8a1c29b6eec78391828708598fe7ca488f912750
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    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
    R src/docbkx/en/dhis2_user_man_orgunits.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:
  -----------
  Mtn app: restructure - change file names


  Commit: c4aa7e78b740ccb56d679c12e2086d22930b745a
      https://github.com/dhis2/dhis2-docs/commit/c4aa7e78b740ccb56d679c12e2086d22930b745a
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    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
    R src/docbkx/en/dhis2_user_man_orgunits.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 pull request #77 from dhis2/mtn-restructure

Mtn app: restructure - change file names


  Commit: 3c071866f7c49aaf2820fd42ff89c35cec84d328
      https://github.com/dhis2/dhis2-docs/commit/3c071866f7c49aaf2820fd42ff89c35cec84d328
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    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
    R src/docbkx/en/dhis2_user_man_orgunits.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 SmsDocs


  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


Compare: https://github.com/dhis2/dhis2-docs/compare/b0d665f9ee59...8901b6d602b3
  Thread Previous • Date Previous • • Thread Next