dhis2-documenters team mailing list archive

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

To: dhis2-documenters@xxxxxxxxxxxxxxxxxxx
From: Cecilia Persson <cecilia@xxxxxxxxx>
Date: Tue, 05 Jul 2016 06:16:21 -0700
Reply-to: Cecilia Persson <cecilia@xxxxxxxxx>
Sender: cecilia=dhis2.org@xxxxxxxxxx
  Branch: refs/heads/master
  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


Compare: https://github.com/dhis2/dhis2-docs/compare/37c5f90df09c...12a76a8b1072