← Back to team overview

dhis2-documenters team mailing list archive

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

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

  Thread Previous • Date Previous • • Thread Next 
  Branch: refs/heads/master
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 8d2082ff8c49add71a7780055e3759d6277afd19
      https://github.com/dhis2/dhis2-docs/commit/8d2082ff8c49add71a7780055e3759d6277afd19
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-25 (Mon, 25 Apr 2016)

  Changed paths:
    M src/docbkx/en/resources/bookinfo/bookinfo.xml

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


  Commit: 4ec71a70dc76c4e0090b5c0ea94212c5261528e5
      https://github.com/dhis2/dhis2-docs/commit/4ec71a70dc76c4e0090b5c0ea94212c5261528e5
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-26 (Tue, 26 Apr 2016)

  Changed paths:
    M .gitmodules
    M .utility/index.html
    M pom.xml
    M src/docbkx/en/ccei_user_manual_en.xml
    M src/docbkx/en/dhis2_android_user_man_aggregate.xml
    M src/docbkx/en/dhis2_android_user_man_event_capture.xml
    M src/docbkx/en/dhis2_android_user_man_tracker_capture.xml
    M src/docbkx/en/dhis2_bibliography.xml
    M src/docbkx/en/dhis2_documentation_guide.xml
    M src/docbkx/en/dhis2_implementation_guide_enduser_training.xml
    M src/docbkx/en/dhis2_implementation_guide_installation.xml
    M src/docbkx/en/dhis2_implementation_guide_support.xml
    M src/docbkx/en/dhis2_localization_guide.xml
    M src/docbkx/en/dhis2_preface.xml
    M src/docbkx/en/dhis2_technical_architechture_guide.xml
    M src/docbkx/en/dhis2_user_man_apps.xml
    M src/docbkx/en/dhis2_user_man_creating_gis.xml
    M src/docbkx/en/dhis2_user_man_data_dimensions.xml
    M src/docbkx/en/dhis2_user_man_getting_started.xml
    M src/docbkx/en/dhis2_user_man_introduction.xml
    M src/docbkx/en/dhis2_user_man_mobile_J2ME_GPRS_3G.xml
    M src/docbkx/en/dhis2_user_man_mobile_web_based.xml
    M src/docbkx/en/dhis2_user_man_program_indicators.xml
    M src/docbkx/en/dhis2_user_man_user_management.xml
    M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    M src/docbkx/en/resources/bookinfo/bookinfo.xml
    M src/docbkx/en/resources/bookinfo/legalnotice.xml
    M src/docbkx/en/resources/xsl/fop-cust.xsl
    M src/docbkx/es/dhis2_documentation_guide_es.xml
    M src/docbkx/es/dhis2_implementation_guide_enduser_training.xml
    M src/docbkx/es/dhis2_implementation_guide_installation.xml
    M src/docbkx/es/dhis2_implementation_guide_short.xml
    M src/docbkx/es/dhis2_localization_guide.xml
    M src/docbkx/es/dhis2_preface.xml
    M src/docbkx/es/dhis2_user_man_creating_gis.xml
    M src/docbkx/es/dhis2_user_man_data_elements.xml
    M src/docbkx/es/dhis2_user_man_datasets_forms.xml
    M src/docbkx/es/dhis2_user_man_getting_started.xml
    M src/docbkx/es/dhis2_user_man_integration.xml
    M src/docbkx/es/dhis2_user_man_mobile_J2ME_GPRS_3G.xml
    M src/docbkx/es/dhis2_user_man_mobile_J2ME_sms_transport.xml
    M src/docbkx/es/dhis2_user_man_mobile_web_based.xml
    M src/docbkx/es/dhis2_user_man_web_api.xml
    M src/docbkx/es/resources/bookinfo/legalnotice.xml
    M src/docbkx/fr/dhis2_documentation_guide.xml
    M src/docbkx/fr/dhis2_implementation_guide_enduser_training.xml
    M src/docbkx/fr/dhis2_implementation_guide_installation.xml
    M src/docbkx/fr/dhis2_implementation_guide_short.xml
    M src/docbkx/fr/dhis2_implementation_guide_support.xml
    M src/docbkx/fr/dhis2_localization_guide.xml
    M src/docbkx/fr/dhis2_preface.xml
    M src/docbkx/fr/dhis2_user_man_data_elements.xml
    M src/docbkx/fr/dhis2_user_man_data_elements_and_indicators.xml
    M src/docbkx/fr/dhis2_user_man_getting_started.xml
    M src/docbkx/fr/dhis2_user_man_gis.xml
    M src/docbkx/fr/dhis2_user_man_introduction.xml
    M src/docbkx/fr/resources/bookinfo/legalnotice.xml
    M src/docbkx/pt/dhis2_implementation_guide_installation.xml
    M src/docbkx/pt/dhis2_implementation_guide_short.xml
    M src/docbkx/pt/dhis2_implementation_guide_support.xml
    M src/docbkx/pt/dhis2_user_man_creating_gis.xml
    M src/docbkx/pt/dhis2_user_man_datasets_forms.xml
    M src/docbkx/pt/dhis2_user_man_getting_started.xml
    M src/docbkx/pt/dhis2_user_man_introduction.xml
    M src/docbkx/pt/dhis2_user_man_settings.xml
    M src/docbkx/pt/help_content_pt.xml
    M src/docbkx/pt/resources/bookinfo/legalnotice.xml

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


  Commit: 6cf19dd23b712055579e1c42c9188f4372321c78
      https://github.com/dhis2/dhis2-docs/commit/6cf19dd23b712055579e1c42c9188f4372321c78
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-26 (Tue, 26 Apr 2016)

  Changed paths:
    M .gitignore
    M .travis.yml
    A src/docbkx/build.properties
    M src/docbkx/en/dhis2_android_user_man.xml
    M src/docbkx/en/dhis2_preface.xml
    M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
    M src/docbkx/en/dhis2_user_manual_en.xml

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


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

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
    M src/docbkx/en/dhis2_user_man_using_pivot_table.xml

  Log Message:
  -----------
  Major changes to Data Visualizer, minor change to Pivot table.


  Commit: 3b4a4e908597e5e5841f6fe3560d5e4306858bb7
      https://github.com/dhis2/dhis2-docs/commit/3b4a4e908597e5e5841f6fe3560d5e4306858bb7
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-26 (Tue, 26 Apr 2016)

  Changed paths:
    M .gitignore
    R src/docbkx/build.properties
    M src/docbkx/en/resources/bookinfo/bookinfo.xml

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


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

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
    A src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
    M src/docbkx/en/dhis2_user_manual_en.xml

  Log Message:
  -----------
  Usage Analytics: created topic and content; Data Visualizer: minor edits

Added xref from User Manual doc to Usage Analytics topic.


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

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

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


  Commit: 500101166b8fe4b6c520e043ebf3aa8e024ea450
      https://github.com/dhis2/dhis2-docs/commit/500101166b8fe4b6c520e043ebf3aa8e024ea450
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-27 (Wed, 27 Apr 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: 93e73ede1da80645624a69ef7d6304aa202de51c
      https://github.com/dhis2/dhis2-docs/commit/93e73ede1da80645624a69ef7d6304aa202de51c
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-27 (Wed, 27 Apr 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
    M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml
    M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml

  Log Message:
  -----------
  Event Visualizer: major rework; Data Visualizer: major edits; Usage Analytics: further review


  Commit: 5012044e0c75f3c824003c4cb31ac4d57a25cef0
      https://github.com/dhis2/dhis2-docs/commit/5012044e0c75f3c824003c4cb31ac4d57a25cef0
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-28 (Thu, 28 Apr 2016)

  Changed paths:
    M pom.xml

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


  Commit: 1136c02250e5c8eeb2537e805efe2c9bb7efd749
      https://github.com/dhis2/dhis2-docs/commit/1136c02250e5c8eeb2537e805efe2c9bb7efd749
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-28 (Thu, 28 Apr 2016)

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

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


  Commit: 9e40a5793fd122a3542eceea3d94c2e18bbef25e
      https://github.com/dhis2/dhis2-docs/commit/9e40a5793fd122a3542eceea3d94c2e18bbef25e
  Author: ceciliapersson <cecilia@xxxxxxxxx>
  Date:   2016-04-28 (Thu, 28 Apr 2016)

  Changed paths:
    M .travis.yml

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


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

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml
    M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
    A src/docbkx/en/resources/images/usage_analytics/usage_analytics_interface.png

  Log Message:
  -----------
  Event visualizer: major edits; Usage Analytics: info added and reviewed


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

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

  Log Message:
  -----------
  Event Visualizer: minor edits; Usage Analytics: minor edits.


  Commit: f7f9badda2737de402b1cfd59d71b95401600ca9
      https://github.com/dhis2/dhis2-docs/commit/f7f9badda2737de402b1cfd59d71b95401600ca9
  Author: Jason Pickering <jason.p.pickering@xxxxxxxxx>
  Date:   2016-04-29 (Fri, 29 Apr 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
    M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml
    M src/docbkx/en/dhis2_user_man_using_pivot_table.xml
    A src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
    M src/docbkx/en/dhis2_user_manual_en.xml
    A src/docbkx/en/resources/images/usage_analytics/usage_analytics_interface.png

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

Major review of analytics apps topics. Created Usage Analytics topic.


Compare: https://github.com/dhis2/dhis2-docs/compare/ae9f69295bdc...f7f9badda273
  Thread Previous • Date Previous • • Thread Next