← Back to team overview

dhis2-documenters team mailing list archive

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

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

  Thread Previous • Date Previous • • Thread Next 
  Branch: refs/heads/master
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: a63704b1563259c0f819daa2367b0f45227bf986
      https://github.com/dhis2/dhis2-docs/commit/a63704b1563259c0f819daa2367b0f45227bf986
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M .travis.yml
    M .utility/deploy.sh
    M .utility/index.html
    A pom-short.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    A travis-build.sh

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


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

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

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


  Commit: cc986741d93aa8be747a2352fa335bcbcb03942b
      https://github.com/dhis2/dhis2-docs/commit/cc986741d93aa8be747a2352fa335bcbcb03942b
  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/A PSI provider in Nairobi uses data to inform his practice.jpg
    R src/docbkx/en/resources/images/use_cases/Akros-Logo.png
    R src/docbkx/en/resources/images/use_cases/El Salvador staff analysing data in DHIS2 using tablets.jpg
    R src/docbkx/en/resources/images/use_cases/El Salvador staff reviewing data in DHIS2.jpg
    R src/docbkx/en/resources/images/use_cases/HMIS web portal.png
    R src/docbkx/en/resources/images/use_cases/HNQIS app being used in Glory Clinic in Nairobi Kenya.jpg
    R src/docbkx/en/resources/images/use_cases/PSI Cambodia participates in an evidence based decision making workshop.jpg
    R src/docbkx/en/resources/images/use_cases/PSI Myanmar maps out their data flow.jpg
    R src/docbkx/en/resources/images/use_cases/PSI-English-Logo-COLOR.jpg
    R src/docbkx/en/resources/images/use_cases/Tanzania Mainland DHIS 2 rollout phases for 2014.png
    R src/docbkx/en/resources/images/use_cases/a pharmacist in Cambodia uses the Malaria Case Surveillance app.png
    A src/docbkx/en/resources/images/use_cases/akros_logo.png
    R src/docbkx/en/resources/images/use_cases/chief looking at data.jpg
    A src/docbkx/en/resources/images/use_cases/chief_looking_at_data.jpg
    R src/docbkx/en/resources/images/use_cases/data collection forms.png
    A src/docbkx/en/resources/images/use_cases/data_collection_forms.png
    A src/docbkx/en/resources/images/use_cases/elsalvador_staff_analyse_data_dhis2_tablets.jpg
    A src/docbkx/en/resources/images/use_cases/elsalvador_staff_review_data_dhis2.jpg
    A src/docbkx/en/resources/images/use_cases/hmis_web_portal.png
    A src/docbkx/en/resources/images/use_cases/hnqis_app_used_glory_clinic_nairobi_kenya.jpg
    R src/docbkx/en/resources/images/use_cases/mobile phone.png
    A src/docbkx/en/resources/images/use_cases/mobile_phone.png
    A src/docbkx/en/resources/images/use_cases/pharmacist_cambodia_uses_malaria_case_surveillance_app.png
    A src/docbkx/en/resources/images/use_cases/psi_cambodia_evidence_based_decision_making_workshop.jpg
    A src/docbkx/en/resources/images/use_cases/psi_english_logo_color.jpg
    A src/docbkx/en/resources/images/use_cases/psi_myanmar_maps_data_flow.jpg
    A src/docbkx/en/resources/images/use_cases/psi_provider_nairobi_uses_data_inform_practice.jpg
    A src/docbkx/en/resources/images/use_cases/tanzania_mainland_dhis2_rollout_phases_2014.png

  Log Message:
  -----------
  Use cases: update image links, change citation tag to bold tag


  Commit: c190b84ecaa99d6a3f75f1ce47366fa8c173feec
      https://github.com/dhis2/dhis2-docs/commit/c190b84ecaa99d6a3f75f1ce47366fa8c173feec
  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/A PSI provider in Nairobi uses data to inform his practice.jpg
    R src/docbkx/en/resources/images/use_cases/Akros-Logo.png
    R src/docbkx/en/resources/images/use_cases/El Salvador staff analysing data in DHIS2 using tablets.jpg
    R src/docbkx/en/resources/images/use_cases/El Salvador staff reviewing data in DHIS2.jpg
    R src/docbkx/en/resources/images/use_cases/HMIS web portal.png
    R src/docbkx/en/resources/images/use_cases/HNQIS app being used in Glory Clinic in Nairobi Kenya.jpg
    R src/docbkx/en/resources/images/use_cases/PSI Cambodia participates in an evidence based decision making workshop.jpg
    R src/docbkx/en/resources/images/use_cases/PSI Myanmar maps out their data flow.jpg
    R src/docbkx/en/resources/images/use_cases/PSI-English-Logo-COLOR.jpg
    R src/docbkx/en/resources/images/use_cases/Tanzania Mainland DHIS 2 rollout phases for 2014.png
    R src/docbkx/en/resources/images/use_cases/a pharmacist in Cambodia uses the Malaria Case Surveillance app.png
    A src/docbkx/en/resources/images/use_cases/akros_logo.png
    R src/docbkx/en/resources/images/use_cases/chief looking at data.jpg
    A src/docbkx/en/resources/images/use_cases/chief_looking_at_data.jpg
    R src/docbkx/en/resources/images/use_cases/data collection forms.png
    A src/docbkx/en/resources/images/use_cases/data_collection_forms.png
    A src/docbkx/en/resources/images/use_cases/elsalvador_staff_analyse_data_dhis2_tablets.jpg
    A src/docbkx/en/resources/images/use_cases/elsalvador_staff_review_data_dhis2.jpg
    A src/docbkx/en/resources/images/use_cases/hmis_web_portal.png
    A src/docbkx/en/resources/images/use_cases/hnqis_app_used_glory_clinic_nairobi_kenya.jpg
    R src/docbkx/en/resources/images/use_cases/mobile phone.png
    A src/docbkx/en/resources/images/use_cases/mobile_phone.png
    A src/docbkx/en/resources/images/use_cases/pharmacist_cambodia_uses_malaria_case_surveillance_app.png
    A src/docbkx/en/resources/images/use_cases/psi_cambodia_evidence_based_decision_making_workshop.jpg
    A src/docbkx/en/resources/images/use_cases/psi_english_logo_color.jpg
    A src/docbkx/en/resources/images/use_cases/psi_myanmar_maps_data_flow.jpg
    A src/docbkx/en/resources/images/use_cases/psi_provider_nairobi_uses_data_inform_practice.jpg
    A src/docbkx/en/resources/images/use_cases/tanzania_mainland_dhis2_rollout_phases_2014.png

  Log Message:
  -----------
  Merge pull request #90 -  Use cases: update image links etc

Use cases: update image links, change citation tag to bold tag


Compare: https://github.com/dhis2/dhis2-docs/compare/35857073c180...c190b84ecaa9
  Thread Previous • Date Previous • • Thread Next