dhis2-documenters team mailing list archive

[rachbrooke <rachael@xxxxxxxxx>]

  Branch: refs/heads/use-case-kurdistan
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 3f930dd294d362c24e470c1cc3e898b56b11d760
      https://github.com/dhis2/dhis2-docs/commit/3f930dd294d362c24e470c1cc3e898b56b11d760
  Author: rachbrooke <rachael@xxxxxxxxx>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M src/docbkx/en/content/tutorials/tutorial_scorecards_pivot_tables.xml

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


  Commit: 4719821c3986075de578bdeb43229284a9a77362
      https://github.com/dhis2/dhis2-docs/commit/4719821c3986075de578bdeb43229284a9a77362
  Author: rachbrooke <rachael@xxxxxxxxx>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M src/docbkx/en/content/tutorials/tutorial_scorecards_pivot_tables.xml
    M src/docbkx/en/content/user_stories/kurdistan.xml
    A src/docbkx/en/resources/images/use_cases/kurdistan_map.png

  Log Message:
  -----------
  added image to resources


  Commit: d3e886e20ae15f931ca822deb0dc501a9dd257fc
      https://github.com/dhis2/dhis2-docs/commit/d3e886e20ae15f931ca822deb0dc501a9dd257fc
  Author: rachbrooke <rachael@xxxxxxxxx>
  Date:   2016-12-22 (Thu, 22 Dec 2016)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/events/tracker_capture.xml
    M src/docbkx/en/content/implementer/localization.xml
    M src/docbkx/en/content/user_stories/kurdistan.xml
    M src/docbkx/en/resources/images/i18n/translations_app.png
    A src/docbkx/en/resources/images/pivot_table/kurdistan_terrain.png
    A src/docbkx/en/resources/images/tracker_capture/tc_tei_red_icon.png
    A src/docbkx/en/resources/images/use_cases/kurdistan_dario_corsini.png
    A src/docbkx/en/resources/images/use_cases/kurdistan_flag.png
    A src/docbkx/en/resources/images/use_cases/kurdistan_ipro_screen.png
    A src/docbkx/en/resources/images/use_cases/kurdistan_ipro_screen2.png
    A src/docbkx/en/resources/images/use_cases/kurdistan_ipro_screen3.png
    A src/docbkx/en/resources/images/use_cases/kurdistan_meeting_directorates.png
    A src/docbkx/en/resources/images/use_cases/kurdistan_opening_center_trainin.png
    A src/docbkx/en/resources/images/use_cases/kurdistan_pilot_project_leonardo.png

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

# Conflicts:
#	src/docbkx/en/content/user_stories/kurdistan.xml


  Commit: 1ce006563a7ac0723948fb3d2ddb7defebd82f93
      https://github.com/dhis2/dhis2-docs/commit/1ce006563a7ac0723948fb3d2ddb7defebd82f93
  Author: rachbrooke <rachael@xxxxxxxxx>
  Date:   2016-12-22 (Thu, 22 Dec 2016)

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

  Log Message:
  -----------
  test commit


Compare: https://github.com/dhis2/dhis2-docs/compare/3f930dd294d3^...1ce006563a7a