← Back to team overview

dhis2-documenters team mailing list archive

[dhis2/dhis2-docs] f4b6f3: Merge remote-tracking branch 'refs/remotes/origin/...

 

  Branch: refs/heads/master
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: f4b6f3aba96efc71fd3cabc27888ff28bb99f5b3
      https://github.com/dhis2/dhis2-docs/commit/f4b6f3aba96efc71fd3cabc27888ff28bb99f5b3
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-29 (Fri, 29 Apr 2016)

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress


  Commit: f21fc60bc468de44dab282f19dd900cae4e40d05
      https://github.com/dhis2/dhis2-docs/commit/f21fc60bc468de44dab282f19dd900cae4e40d05
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-29 (Fri, 29 Apr 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_event_reports.xml
    M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml

  Log Message:
  -----------
  Event Reports: major restructuring and edits; Event Visualizer: minor edits.


  Commit: 2a9677c4d538211c819ff661035f9bfe7ee7da73
      https://github.com/dhis2/dhis2-docs/commit/2a9677c4d538211c819ff661035f9bfe7ee7da73
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-29 (Fri, 29 Apr 2016)

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

  Log Message:
  -----------
  Event reports: minor edit


  Commit: 1dcb5c7f1b4214b4a09e991e94e691df84610c04
      https://github.com/dhis2/dhis2-docs/commit/1dcb5c7f1b4214b4a09e991e94e691df84610c04
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-29 (Fri, 29 Apr 2016)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress


  Commit: b59e4c66cf9540f533af4a0d63b8df171ec3abe0
      https://github.com/dhis2/dhis2-docs/commit/b59e4c66cf9540f533af4a0d63b8df171ec3abe0
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-05-02 (Mon, 02 May 2016)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress


  Commit: 9e4fd00ad2a4a871068b96cd267eaa10e4055cd5
      https://github.com/dhis2/dhis2-docs/commit/9e4fd00ad2a4a871068b96cd267eaa10e4055cd5
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-05-02 (Mon, 02 May 2016)

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

  Log Message:
  -----------
  Data usage analytics: major edits


  Commit: 34d0688f39c7a8f73b8d2b6660ee9e714c6743d8
      https://github.com/dhis2/dhis2-docs/commit/34d0688f39c7a8f73b8d2b6660ee9e714c6743d8
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-05-02 (Mon, 02 May 2016)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress


  Commit: 4fb035d75ef22c30e6c13659a516d8455e512ac0
      https://github.com/dhis2/dhis2-docs/commit/4fb035d75ef22c30e6c13659a516d8455e512ac0
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-05-03 (Tue, 03 May 2016)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress


  Commit: 4682db773aa0b8869521ad42617898cb4e96b88c
      https://github.com/dhis2/dhis2-docs/commit/4682db773aa0b8869521ad42617898cb4e96b88c
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-05-03 (Tue, 03 May 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_event_reports.xml
    M src/docbkx/en/resources/images/event_report/event_report.png

  Log Message:
  -----------
  Event Reports: final edits, screen shot updated


  Commit: aa73af1d898f78c673e1d37bc10ad8f90373a473
      https://github.com/dhis2/dhis2-docs/commit/aa73af1d898f78c673e1d37bc10ad8f90373a473
  Author: Cecilia Persson <cecilia@xxxxxxxxx>
  Date:   2016-05-04 (Wed, 04 May 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_event_reports.xml
    M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    M src/docbkx/en/resources/images/event_report/event_report.png

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

Event reports: reviewed and updated


Compare: https://github.com/dhis2/dhis2-docs/compare/019001b85190...aa73af1d898f