← Back to team overview

dhis2-documenters team mailing list archive

[dhis2/dhis2-docs] 0cab65: Merge branch 'master' of github.com:dhis2/dhis2-do...

 

  Branch: refs/heads/lars-docs
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 0cab6556febca48f359ad6cffa5167339d224273
      https://github.com/dhis2/dhis2-docs/commit/0cab6556febca48f359ad6cffa5167339d224273
  Author: Lars Helge Øverland <lars@xxxxxxxxx>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M src/docbkx/en/content/analysis/data_visualizer.xml
    M src/docbkx/en/content/analysis/pivot_tables.xml
    M src/docbkx/en/content/datastore_manager/datastore_manager.xml
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/maintenance/data_element/t_dataelgroupset_create.xml
    M src/docbkx/en/content/maintenance/org_unit/c_orgunit.xml
    M src/docbkx/en/content/maintenance/org_unit/t_orgunit_close.xml
    M src/docbkx/en/content/maintenance/org_unit/t_orgunitgroupset_create.xml
    M src/docbkx/en/dhis2_user_manual_en.xml
    M src/docbkx/en/resources/images/datastore_manager/datamgr_codeview.png
    M src/docbkx/en/resources/images/datastore_manager/datamgr_editcode_error.png
    M src/docbkx/en/resources/images/datastore_manager/datamgr_treeview.png

  Log Message:
  -----------
  Merge branch 'master' of github.com:dhis2/dhis2-docs


  Commit: ea6b1425f364bba3c8996e9edd1f413bfee028ee
      https://github.com/dhis2/dhis2-docs/commit/ea6b1425f364bba3c8996e9edd1f413bfee028ee
  Author: Lars Helge Øverland <lars@xxxxxxxxx>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml

  Log Message:
  -----------
  Web api, deleted objects


  Commit: 5af5bb65dedba92325a0468086db1abe4eab957c
      https://github.com/dhis2/dhis2-docs/commit/5af5bb65dedba92325a0468086db1abe4eab957c
  Author: Lars Helge Øverland <lars@xxxxxxxxx>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M src/docbkx/en/content/analysis/data_visualizer.xml
    M src/docbkx/en/content/analysis/pivot_tables.xml
    M src/docbkx/en/content/datastore_manager/datastore_manager.xml
    M src/docbkx/en/content/maintenance/data_element/t_dataelgroupset_create.xml
    M src/docbkx/en/content/maintenance/org_unit/c_orgunit.xml
    M src/docbkx/en/content/maintenance/org_unit/t_orgunit_close.xml
    M src/docbkx/en/content/maintenance/org_unit/t_orgunitgroupset_create.xml
    M src/docbkx/en/dhis2_user_manual_en.xml
    M src/docbkx/en/resources/images/datastore_manager/datamgr_codeview.png
    M src/docbkx/en/resources/images/datastore_manager/datamgr_editcode_error.png
    M src/docbkx/en/resources/images/datastore_manager/datamgr_treeview.png

  Log Message:
  -----------
  Merge branch 'master' into lars-docs


  Commit: 97445f4357189cb14009e8366c33859e625ebe15
      https://github.com/dhis2/dhis2-docs/commit/97445f4357189cb14009e8366c33859e625ebe15
  Author: Lars Helge Øverland <lars@xxxxxxxxx>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Log Message:
  -----------
  Merge branch 'lars-docs' of github.com:dhis2/dhis2-docs into lars-docs


Compare: https://github.com/dhis2/dhis2-docs/compare/852c3782e7da...97445f435718