← Back to team overview

dhis2-documenters team mailing list archive

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

 

  Branch: refs/heads/v2-use-cases
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: dfddb1761c005549ef53cbbdd8e982667bb6aedc
      https://github.com/dhis2/dhis2-docs/commit/dfddb1761c005549ef53cbbdd8e982667bb6aedc
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

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


  Commit: 28f1fb56928126ae7b45c545dbf3f580fe277682
      https://github.com/dhis2/dhis2-docs/commit/28f1fb56928126ae7b45c545dbf3f580fe277682
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M src/docbkx/en/content/user_stories/akros.xml
    M src/docbkx/en/content/user_stories/psi.xml
    M src/docbkx/en/content/user_stories/udsm.xml
    R src/docbkx/en/resources/images/use_cases/WASH_F_E_SAG_data_collection_form.PNG
    A src/docbkx/en/resources/images/use_cases/cambodia_malaria_case_surveillance.png
    R src/docbkx/en/resources/images/use_cases/hnqis_app_used_glory_clinic_nairobi_kenya.jpg
    A src/docbkx/en/resources/images/use_cases/hnqis_gloryclinic_nairobikenya.jpg
    R src/docbkx/en/resources/images/use_cases/pharmacist_cambodia_uses_malaria_case_surveillance_app.png
    R src/docbkx/en/resources/images/use_cases/psi_cambodia_evidence_based_decision_making_workshop.jpg
    A src/docbkx/en/resources/images/use_cases/psi_cambodia_workshop.jpg
    R src/docbkx/en/resources/images/use_cases/tanzania_mainland_dhis2_rollout_phases_2014.png
    A src/docbkx/en/resources/images/use_cases/tanzania_rollout_phases_2014.png
    A src/docbkx/en/resources/images/use_cases/wash_data_collection_form.PNG

  Log Message:
  -----------
  Use cases: more image fixing


  Commit: 12a76a8b10727ffa043173d5d182e42a23775b10
      https://github.com/dhis2/dhis2-docs/commit/12a76a8b10727ffa043173d5d182e42a23775b10
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M src/docbkx/en/content/user_stories/akros.xml
    M src/docbkx/en/content/user_stories/psi.xml
    M src/docbkx/en/content/user_stories/udsm.xml
    R src/docbkx/en/resources/images/use_cases/WASH_F_E_SAG_data_collection_form.PNG
    A src/docbkx/en/resources/images/use_cases/cambodia_malaria_case_surveillance.png
    R src/docbkx/en/resources/images/use_cases/hnqis_app_used_glory_clinic_nairobi_kenya.jpg
    A src/docbkx/en/resources/images/use_cases/hnqis_gloryclinic_nairobikenya.jpg
    R src/docbkx/en/resources/images/use_cases/pharmacist_cambodia_uses_malaria_case_surveillance_app.png
    R src/docbkx/en/resources/images/use_cases/psi_cambodia_evidence_based_decision_making_workshop.jpg
    A src/docbkx/en/resources/images/use_cases/psi_cambodia_workshop.jpg
    R src/docbkx/en/resources/images/use_cases/tanzania_mainland_dhis2_rollout_phases_2014.png
    A src/docbkx/en/resources/images/use_cases/tanzania_rollout_phases_2014.png
    A src/docbkx/en/resources/images/use_cases/wash_data_collection_form.PNG

  Log Message:
  -----------
  Merge pull request #93 - Use cases: more image fixing

Use cases: more image fixing


  Commit: 6eb17b9228fdcb425d5bf8b00cc10f934b69696c
      https://github.com/dhis2/dhis2-docs/commit/6eb17b9228fdcb425d5bf8b00cc10f934b69696c
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

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


  Commit: 6558f1338761c8c0e1ba045ddb12136c21b3ee40
      https://github.com/dhis2/dhis2-docs/commit/6558f1338761c8c0e1ba045ddb12136c21b3ee40
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M src/docbkx/en/content/user_stories/akros.xml
    M src/docbkx/en/content/user_stories/psi.xml
    M src/docbkx/en/content/user_stories/udsm.xml

  Log Message:
  -----------
  Use cases: further link troubleshooting and testing


  Commit: 1f4caedb10612b41fda4ac005f39735421d8f39e
      https://github.com/dhis2/dhis2-docs/commit/1f4caedb10612b41fda4ac005f39735421d8f39e
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M src/docbkx/en/content/user_stories/akros.xml
    M src/docbkx/en/content/user_stories/psi.xml
    M src/docbkx/en/content/user_stories/udsm.xml

  Log Message:
  -----------
  Merge pull request #94 - Use cases: further link troubleshooting and testing

Use cases: further link troubleshooting and testing


  Commit: 02273e14e3079736e62f8cb8749fd27e6a1d5e6d
      https://github.com/dhis2/dhis2-docs/commit/02273e14e3079736e62f8cb8749fd27e6a1d5e6d
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

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


  Commit: 47e1ec154ae22e0ce3fa38d577c2583a2fdc7f44
      https://github.com/dhis2/dhis2-docs/commit/47e1ec154ae22e0ce3fa38d577c2583a2fdc7f44
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M src/docbkx/en/content/user_stories/akros.xml
    M src/docbkx/en/content/user_stories/udsm.xml
    A src/docbkx/en/resources/images/use_cases/new_map_tanzania.png
    A src/docbkx/en/resources/images/use_cases/new_scorecards.png
    A src/docbkx/en/resources/images/use_cases/new_wash_collectionform.png

  Log Message:
  -----------
  Use cases_ more link fixing


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

  Changed paths:
    M src/docbkx/en/content/user_stories/akros.xml
    M src/docbkx/en/content/user_stories/udsm.xml
    A src/docbkx/en/resources/images/use_cases/new_map_tanzania.png
    A src/docbkx/en/resources/images/use_cases/new_scorecards.png
    A src/docbkx/en/resources/images/use_cases/new_wash_collectionform.png

  Log Message:
  -----------
  Merge pull request #95 Use cases - more link fixing 

Use cases - more link fixing


  Commit: d3c0b49974888850fa4b51a520ed14c37598497b
      https://github.com/dhis2/dhis2-docs/commit/d3c0b49974888850fa4b51a520ed14c37598497b
  Author: rachael <rachael@xxxxxxxxx>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M src/docbkx/en/content/user_stories/akros.xml
    M src/docbkx/en/content/user_stories/psi.xml
    M src/docbkx/en/content/user_stories/udsm.xml
    R src/docbkx/en/resources/images/use_cases/WASH_F_E_SAG_data_collection_form.PNG
    A src/docbkx/en/resources/images/use_cases/cambodia_malaria_case_surveillance.png
    R src/docbkx/en/resources/images/use_cases/hnqis_app_used_glory_clinic_nairobi_kenya.jpg
    A src/docbkx/en/resources/images/use_cases/hnqis_gloryclinic_nairobikenya.jpg
    A src/docbkx/en/resources/images/use_cases/new_map_tanzania.png
    A src/docbkx/en/resources/images/use_cases/new_scorecards.png
    A src/docbkx/en/resources/images/use_cases/new_wash_collectionform.png
    R src/docbkx/en/resources/images/use_cases/pharmacist_cambodia_uses_malaria_case_surveillance_app.png
    R src/docbkx/en/resources/images/use_cases/psi_cambodia_evidence_based_decision_making_workshop.jpg
    A src/docbkx/en/resources/images/use_cases/psi_cambodia_workshop.jpg
    R src/docbkx/en/resources/images/use_cases/tanzania_mainland_dhis2_rollout_phases_2014.png
    A src/docbkx/en/resources/images/use_cases/tanzania_rollout_phases_2014.png
    A src/docbkx/en/resources/images/use_cases/wash_data_collection_form.PNG

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master' into v2-use-cases


Compare: https://github.com/dhis2/dhis2-docs/compare/12bb48802173...d3c0b4997488