dhis2-documenters team mailing list archive

["Jason P. Pickering" <jason.p.pickering@xxxxxxxxx>]

  Branch: refs/heads/docinprogress
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 6bc9fc74e68a20a920553e37bcd056c11af9c01a
      https://github.com/dhis2/dhis2-docs/commit/6bc9fc74e68a20a920553e37bcd056c11af9c01a
  Author: Lars Helge Overland <larshelge@xxxxxxxxx>
  Date:   2016-06-15 (Wed, 15 Jun 2016)

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

  Log Message:
  -----------
  Custom forms, js functions


  Commit: ec9fd097db0e6d146ef9d1e23f8a145f2e73d3a9
      https://github.com/dhis2/dhis2-docs/commit/ec9fd097db0e6d146ef9d1e23f8a145f2e73d3a9
  Author: Lars Helge Overland <larshelge@xxxxxxxxx>
  Date:   2016-06-15 (Wed, 15 Jun 2016)

  Changed paths:
    A src/docbkx/en/dhis2_release_notes.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    M src/docbkx/en/dhis2_user_manual_en.xml
    A src/docbkx/en/resources/images/icons/info.png
    A src/docbkx/en/resources/images/icons/upgrade.png
    A src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml

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


  Commit: 853cfe99203161217fc44cdedaf507fab3f937a3
      https://github.com/dhis2/dhis2-docs/commit/853cfe99203161217fc44cdedaf507fab3f937a3
  Author: Lars Helge Overland <larshelge@xxxxxxxxx>
  Date:   2016-06-15 (Wed, 15 Jun 2016)

  Changed paths:
    R src/docbkx/en/dhis2_release_notes.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml
    M src/docbkx/en/dhis2_user_manual_en.xml
    R src/docbkx/en/resources/images/icons/info.png
    R src/docbkx/en/resources/images/icons/upgrade.png
    R src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml

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

This reverts commit ec9fd097db0e6d146ef9d1e23f8a145f2e73d3a9, reversing
changes made to 6bc9fc74e68a20a920553e37bcd056c11af9c01a.

Reverting merge ec9fd097db0e6d146ef9d1e23f8a145f2e73d3a9


  Commit: b320ea02f81062fcfc9a85cef5c003482ffc944b
      https://github.com/dhis2/dhis2-docs/commit/b320ea02f81062fcfc9a85cef5c003482ffc944b
  Author: Lars Helge Overland <larshelge@xxxxxxxxx>
  Date:   2016-06-15 (Wed, 15 Jun 2016)

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

  Log Message:
  -----------
  Functions


  Commit: 679575beef75514fd682eca150d889814eb95a33
      https://github.com/dhis2/dhis2-docs/commit/679575beef75514fd682eca150d889814eb95a33
  Author: Lars Helge Overland <larshelge@xxxxxxxxx>
  Date:   2016-06-15 (Wed, 15 Jun 2016)

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

  Log Message:
  -----------
  Functions


  Commit: 1679d083b833546ae96da73ae1332bab049db396
      https://github.com/dhis2/dhis2-docs/commit/1679d083b833546ae96da73ae1332bab049db396
  Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

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

  Log Message:
  -----------
  Updating MapShaper link. Fixes #40.


  Commit: 89b99264e84da5e1ba342eaf2fa692b282ae903a
      https://github.com/dhis2/dhis2-docs/commit/89b99264e84da5e1ba342eaf2fa692b282ae903a
  Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

  Changed paths:
    A src/docbkx/en/dhis2_release_notes.xml
    A src/docbkx/en/resources/images/icons/info.png
    A src/docbkx/en/resources/images/icons/upgrade.png

  Log Message:
  -----------
  Adding new chapter for release notes and upgrade notes.


  Commit: 47865b75c3d3c1a11f6dc5e4918de104fbb67a39
      https://github.com/dhis2/dhis2-docs/commit/47865b75c3d3c1a11f6dc5e4918de104fbb67a39
  Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_release_notes.xml
    M src/docbkx/en/dhis2_user_manual_en.xml

  Log Message:
  -----------
  Comment out 2.24 release notes for now. Enable release notes in main manual.


  Commit: a1360de7a6f2e32cec7338b7fbc9a50470370d1f
      https://github.com/dhis2/dhis2-docs/commit/a1360de7a6f2e32cec7338b7fbc9a50470370d1f
  Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

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

  Log Message:
  -----------
  Adding quote to make JSON palyoad valid.


  Commit: d858f7f0f3b74197f112558be80a8a6682499968
      https://github.com/dhis2/dhis2-docs/commit/d858f7f0f3b74197f112558be80a8a6682499968
  Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

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

  Log Message:
  -----------
  Fix the fix.


  Commit: d214ef2e0cf1395c5ba8b8dd71061e08f064420d
      https://github.com/dhis2/dhis2-docs/commit/d214ef2e0cf1395c5ba8b8dd71061e08f064420d
  Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M src/docbkx/en/dhis2_user_man_creating_gis.xml
    M src/docbkx/en/dhis2_user_man_data_elements.xml
    M src/docbkx/en/dhis2_user_man_indicators.xml
    M src/docbkx/en/dhis2_user_man_orgunits.xml
    M src/docbkx/en/dhis2_user_man_web_api.xml

  Log Message:
  -----------
  Merging with master. May need edits.


Compare: https://github.com/dhis2/dhis2-docs/compare/8c024d0ba22e...d214ef2e0cf1