← Back to team overview

dhis2-documenters team mailing list archive

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

 

  Branch: refs/heads/docinprogress
  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.


Compare: https://github.com/dhis2/dhis2-docs/compare/8d2082ff8c49^...2bacf42fb972