← Back to team overview

dhis2-documenters team mailing list archive

[dhis2/dhis2-docs] 1b6e9f: Merge branch 'master' into docinprogress

 

  Branch: refs/heads/master
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 1b6e9fec8a291e1b48af48c94e0f57996a86be39
      https://github.com/dhis2/dhis2-docs/commit/1b6e9fec8a291e1b48af48c94e0f57996a86be39
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

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


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

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

  Log Message:
  -----------
  Man app: data sets - added changes from corrupt commit

Commits
679575beef75514fd682eca150d889814eb95a33
6bc9fc74e68a20a920553e37bcd056c11af9c01a


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

  Changed paths:
    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

  Log Message:
  -----------
  Man app: Data sets - more updates; Org units and Data elements - minor edits.


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

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_gis.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

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


  Commit: 6427968041d9a6dce0454bc8fb07c40715a4c4f7
      https://github.com/dhis2/dhis2-docs/commit/6427968041d9a6dce0454bc8fb07c40715a4c4f7
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
    M src/docbkx/en/dhis2_user_man_program_rules.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    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

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


  Commit: 18807445065896c7ed38964a5e2e673efe8bf66e
      https://github.com/dhis2/dhis2-docs/commit/18807445065896c7ed38964a5e2e673efe8bf66e
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

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

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


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

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

  Log Message:
  -----------
  Web Api: update data usage analytics section


  Commit: 000c33ef0079604256aa5eb19f35cc7b299c28ff
      https://github.com/dhis2/dhis2-docs/commit/000c33ef0079604256aa5eb19f35cc7b299c28ff
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

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

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

Merge latest updates on docinprogress with master


Compare: https://github.com/dhis2/dhis2-docs/compare/6a97c83ce8e8...000c33ef0079