← Back to team overview

dhis2-documenters team mailing list archive

[dhis2/dhis2-docs] e14ae8: Merge pull request #1 from dhis2/master

 

  Branch: refs/heads/doc-search
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: e14ae8c7f57b4379e88d21ea0c1fce610c819939
      https://github.com/dhis2/dhis2-docs/commit/e14ae8c7f57b4379e88d21ea0c1fce610c819939
  Author: Philip-Larsen-Donnelly <35666657+Philip-Larsen-Donnelly@xxxxxxxxxxxxxxxxxxxxxxxx>
  Date:   2018-02-20 (Tue, 20 Feb 2018)

  Changed paths:
    M src/docbkx/en/content/developer/apps.xml
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/maintenance/tracker/pg_indicator/c_pg_indicator.xml
    M src/docbkx/en/content/maintenance/tracker/pg_rule/t_pg_rule_create.xml
    M src/docbkx/en/content/settings/settings.xml

  Log Message:
  -----------
  Merge pull request #1 from dhis2/master

sync fork


  Commit: a34695c7b67b192eee4914673e748054e5ce472e
      https://github.com/dhis2/dhis2-docs/commit/a34695c7b67b192eee4914673e748054e5ce472e
  Author: Henning Håkonsen <henninghaakonsen@xxxxxx>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

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

  Log Message:
  -----------
  Short description added for event report download


  Commit: 1b66f6c23a1174b3160e54e3897711c8afe985c5
      https://github.com/dhis2/dhis2-docs/commit/1b66f6c23a1174b3160e54e3897711c8afe985c5
  Author: Lukas Wijgaart van Dijk <lukasewvd@xxxxxxxxx>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

  Changed paths:
    M src/docbkx/en/content/events/tracker_capture.xml
    M src/docbkx/en/content/maintenance/data_element/t_datael_create.xml

  Log Message:
  -----------
  Added lock dashboard, orgUnit and image info


  Commit: c5fdb66419e60243f2a759d0c5e557eab2266d81
      https://github.com/dhis2/dhis2-docs/commit/c5fdb66419e60243f2a759d0c5e557eab2266d81
  Author: Lukas Wijgaart van Dijk <lukasewvd@xxxxxxxxx>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

  Changed paths:
    M src/docbkx/en/content/events/tracker_capture.xml
    A src/docbkx/en/resources/images/tracker_capture/top_bar.png

  Log Message:
  -----------
  Added top-bar documentation


  Commit: b12bc559d1536bc69633f63ab2467d3250da85c4
      https://github.com/dhis2/dhis2-docs/commit/b12bc559d1536bc69633f63ab2467d3250da85c4
  Author: Ameen <ameen@xxxxxxxxx>
  Date:   2018-02-26 (Mon, 26 Feb 2018)

  Changed paths:
    M src/docbkx/en/content/implementer/installation.xml

  Log Message:
  -----------
  Updated ehcache remote object port documentation


  Commit: 7fbf87e12cafe388ada60d9f6378a43fd8a3c6a6
      https://github.com/dhis2/dhis2-docs/commit/7fbf87e12cafe388ada60d9f6378a43fd8a3c6a6
  Author: Ameen <ameen@xxxxxxxxx>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M src/docbkx/en/content/implementer/installation.xml

  Log Message:
  -----------
  Changed sample remote object port from 40001 to 5001


  Commit: 67f7d350ec591ff7ca2675a2305bb25d99ee2269
      https://github.com/dhis2/dhis2-docs/commit/67f7d350ec591ff7ca2675a2305bb25d99ee2269
  Author: Henning Håkonsen <henninghaakonsen@xxxxxx>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

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

  Log Message:
  -----------
  fixed build failure


  Commit: ca0c691061087ef57b1d077db31d97ca1860dfd1
      https://github.com/dhis2/dhis2-docs/commit/ca0c691061087ef57b1d077db31d97ca1860dfd1
  Author: Kjetil Svalestuen <kjetil@xxxxxxxxx>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M src/docbkx/en/content/data_admin/data_admin.xml
    A src/docbkx/en/resources/images/scheduler/add_new_job.png
    A src/docbkx/en/resources/images/scheduler/delete_job.png
    A src/docbkx/en/resources/images/scheduler/overview.png

  Log Message:
  -----------
  Added docs for the scheduler app


  Commit: 670136cb7973166b21e704d23add4262c8130379
      https://github.com/dhis2/dhis2-docs/commit/670136cb7973166b21e704d23add4262c8130379
  Author: Kjetil Svalestuen <kjetil@xxxxxxxxx>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M src/docbkx/en/content/maintenance/common/mtn_share.xml
    M src/docbkx/en/content/sharing/sharing.xml

  Log Message:
  -----------
  Add docs for new sharing settings


  Commit: 2ab58199e44b569ecc138851608635eb11c2a3e9
      https://github.com/dhis2/dhis2-docs/commit/2ab58199e44b569ecc138851608635eb11c2a3e9
  Author: Jim Grace <jimgrace@xxxxxxxxx>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M src/docbkx/en/content/maintenance/predictor/t_predictor_create.xml

  Log Message:
  -----------
  Document predictor functions IF() and ISNULL()


  Commit: a22ab69e4d17efd562f610be4a21c941e733e03e
      https://github.com/dhis2/dhis2-docs/commit/a22ab69e4d17efd562f610be4a21c941e733e03e
  Author: Jim Grace <jimgrace@xxxxxxxxxxxxxxxxxxxxxxxx>
  Date:   2018-02-27 (Tue, 27 Feb 2018)

  Changed paths:
    M src/docbkx/en/content/maintenance/predictor/t_predictor_create.xml

  Log Message:
  -----------
  Merge pull request #779 from dhis2/jim-docs

Document predictor functions IF() and ISNULL()


  Commit: 41a2ca54bc330d7c79e9b5e137af69ebd0f3b193
      https://github.com/dhis2/dhis2-docs/commit/41a2ca54bc330d7c79e9b5e137af69ebd0f3b193
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

  Changed paths:
    M src/docbkx/en/content/maintenance/predictor/t_predictor_create.xml

  Log Message:
  -----------
  Merge branch 'master' into ehcache-port-patch-doc


  Commit: 0fb53e362f6d9572e7524efdfbf9f5b0755fd8d0
      https://github.com/dhis2/dhis2-docs/commit/0fb53e362f6d9572e7524efdfbf9f5b0755fd8d0
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

  Changed paths:
    M src/docbkx/en/content/maintenance/predictor/t_predictor_create.xml

  Log Message:
  -----------
  Merge branch 'master' into event-report-download


  Commit: 1adaf525d08bb326b3821c14ad41f39be3352a85
      https://github.com/dhis2/dhis2-docs/commit/1adaf525d08bb326b3821c14ad41f39be3352a85
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

  Changed paths:
    M src/docbkx/en/content/implementer/installation.xml

  Log Message:
  -----------
  Merge pull request #775 from dhis2/ehcache-port-patch-doc

Updated ehcache remote object port documentation


  Commit: 536415664f834003aa6406e74a78704d074a3aed
      https://github.com/dhis2/dhis2-docs/commit/536415664f834003aa6406e74a78704d074a3aed
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

  Changed paths:
    M src/docbkx/en/content/implementer/installation.xml

  Log Message:
  -----------
  Merge branch 'master' into event-report-download


  Commit: 23e861c25164b30dfb2375123392c7b7aaf682e4
      https://github.com/dhis2/dhis2-docs/commit/23e861c25164b30dfb2375123392c7b7aaf682e4
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

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

  Log Message:
  -----------
  Merge pull request #776 from dhis2/event-report-download

Event report download


  Commit: 0c3cefea8e580f122453d2c13530235b82f49140
      https://github.com/dhis2/dhis2-docs/commit/0c3cefea8e580f122453d2c13530235b82f49140
  Author: lkwaerst <lkrw121@xxxxxxxxx>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/maintenance/tracker/tracked_entity/t_te_attribute_create.xml

  Log Message:
  -----------
  Image attributes and documents


  Commit: 0ab08db39019cda111152c4535e7d3e15f7d06b0
      https://github.com/dhis2/dhis2-docs/commit/0ab08db39019cda111152c4535e7d3e15f7d06b0
  Author: Lukas Wijgaart van Dijk <lukasewvd@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/events/tracker_capture.xml

  Log Message:
  -----------
  Removed section with register TEI w/o program.


  Commit: e47e05054dcc65b8f4c85612babdfacc6d53b6ba
      https://github.com/dhis2/dhis2-docs/commit/e47e05054dcc65b8f4c85612babdfacc6d53b6ba
  Author: Lukas Wijgaart van Dijk <lukasewvd@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/events/tracker_capture.xml

  Log Message:
  -----------
  Added event creation docs


  Commit: 2b7bcf063c6338e28819ee2ea14b65a314df70da
      https://github.com/dhis2/dhis2-docs/commit/2b7bcf063c6338e28819ee2ea14b65a314df70da
  Author: Lukas Wijgaart van Dijk <lukasewvd@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/events/tracker_capture.xml

  Log Message:
  -----------
  minor fix


  Commit: 844acf94eebf77bd229fda2f2e1492c842281955
      https://github.com/dhis2/dhis2-docs/commit/844acf94eebf77bd229fda2f2e1492c842281955
  Author: Lukas Wijgaart van Dijk <lukasewvd@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/events/tracker_capture.xml
    A src/docbkx/en/resources/images/tracker_capture/compareForm.png

  Log Message:
  -----------
  Added docs for comapre form


  Commit: 88ca2a6b29e5941d97cbdc8fd0e9881d2851d33e
      https://github.com/dhis2/dhis2-docs/commit/88ca2a6b29e5941d97cbdc8fd0e9881d2851d33e
  Author: zubaira <zubair@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    A src/docbkx/en/content/maintenance/data_set/t_dataset_notification_manage.xml
    A src/docbkx/en/resources/images/datasets/dataset_notification_create.png

  Log Message:
  -----------
  dsnt docs


  Commit: b80de8bda1287377f030395837a334d47a0f514e
      https://github.com/dhis2/dhis2-docs/commit/b80de8bda1287377f030395837a334d47a0f514e
  Author: zubaira <zubair@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/dashboard/dashboard.xml
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/implementer/installation.xml
    M src/docbkx/en/content/maintenance/predictor/t_predictor_create.xml

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


  Commit: 03ad1fb665d098a23e70d41cbec88bcfcae6d6f6
      https://github.com/dhis2/dhis2-docs/commit/03ad1fb665d098a23e70d41cbec88bcfcae6d6f6
  Author: Lukas Wijgaart van Dijk <lukasewvd@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/events/tracker_capture.xml

  Log Message:
  -----------
  Minor fix


  Commit: 95931118fc085a3028472f09beb3e755fd65b788
      https://github.com/dhis2/dhis2-docs/commit/95931118fc085a3028472f09beb3e755fd65b788
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

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

  Log Message:
  -----------
  document ImportReportMode


  Commit: 189a9e6a440421681713b170280b625ba1df6857
      https://github.com/dhis2/dhis2-docs/commit/189a9e6a440421681713b170280b625ba1df6857
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

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

  Log Message:
  -----------
  Merge pull request #781 from dhis2/events-importreport-mode

document ImportReportMode


  Commit: 8cf4d38361b1e380eaa6b5044a5f9d0a4177fa78
      https://github.com/dhis2/dhis2-docs/commit/8cf4d38361b1e380eaa6b5044a5f9d0a4177fa78
  Author: Zubair Asghar <zubair@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

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

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


  Commit: 82c70669b02cb15e2397a6f903ea730cd55a1fd6
      https://github.com/dhis2/dhis2-docs/commit/82c70669b02cb15e2397a6f903ea730cd55a1fd6
  Author: zubaira <zubair@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/maintenance/data_set/t_dataset_notification_manage.xml

  Log Message:
  -----------
  Dataset notification docs


  Commit: eeb88471fbe2dab60e3ad1f167b587b526153098
      https://github.com/dhis2/dhis2-docs/commit/eeb88471fbe2dab60e3ad1f167b587b526153098
  Author: zubaira <zubair@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    A src/docbkx/en/resources/images/datasets/when_to_send.png
    A src/docbkx/en/resources/images/datasets/who_to_send.png

  Log Message:
  -----------
  dataset notification snapshots


  Commit: 99006bc899eb226a276f968c60283c6006aff06d
      https://github.com/dhis2/dhis2-docs/commit/99006bc899eb226a276f968c60283c6006aff06d
  Author: Zubair Asghar <zubair@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    A src/docbkx/en/content/maintenance/data_set/t_dataset_notification_manage.xml
    A src/docbkx/en/resources/images/datasets/dataset_notification_create.png
    A src/docbkx/en/resources/images/datasets/when_to_send.png
    A src/docbkx/en/resources/images/datasets/who_to_send.png

  Log Message:
  -----------
  dataset notification docs (#782)

dataset notification docs


  Commit: cc682215a7eb6e698a72771c65eb0d3289aaed44
      https://github.com/dhis2/dhis2-docs/commit/cc682215a7eb6e698a72771c65eb0d3289aaed44
  Author: zubaira <zubair@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/mobile/sms_command.xml
    A src/docbkx/en/resources/images/dhis2_mobile_sms/TEI_parser.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/programstage_data_parser.png

  Log Message:
  -----------
  sms command snapshots


  Commit: 643cd28a99721fb0a626824a849c0861d011b1e1
      https://github.com/dhis2/dhis2-docs/commit/643cd28a99721fb0a626824a849c0861d011b1e1
  Author: zubaira <zubair@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

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

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


  Commit: 511621883894ba28d6e34b204e6cfd48b2b413a4
      https://github.com/dhis2/dhis2-docs/commit/511621883894ba28d6e34b204e6cfd48b2b413a4
  Author: zubaira <zubair@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

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


  Commit: c74877e33006230b4e124c318c2ad394bc429c6e
      https://github.com/dhis2/dhis2-docs/commit/c74877e33006230b4e124c318c2ad394bc429c6e
  Author: Zubair Asghar <zubair@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/mobile/sms_command.xml
    A src/docbkx/en/resources/images/dhis2_mobile_sms/TEI_parser.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/programstage_data_parser.png

  Log Message:
  -----------
  sms command snapshots (#783)

sms command snapshots


  Commit: 5e1667571050a3d061b829802e81b6bd94d53baa
      https://github.com/dhis2/dhis2-docs/commit/5e1667571050a3d061b829802e81b6bd94d53baa
  Author: zubaira <zubair@xxxxxxxxx>
  Date:   2018-03-01 (Thu, 01 Mar 2018)

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


  Commit: d2b310d8120c713b65cfcf25f614e835226dac53
      https://github.com/dhis2/dhis2-docs/commit/d2b310d8120c713b65cfcf25f614e835226dac53
  Author: zubaira <zubair@xxxxxxxxx>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/maintenance/data_set/t_dataset_notification_manage.xml
    M src/docbkx/en/content/maintenance/data_set/toc_dataset.xml

  Log Message:
  -----------
  minor update for dsnt


  Commit: 55e67b5162a30d8b668b4897c016139bcabc9738
      https://github.com/dhis2/dhis2-docs/commit/55e67b5162a30d8b668b4897c016139bcabc9738
  Author: Zubair Asghar <zubair@xxxxxxxxx>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/maintenance/data_set/t_dataset_notification_manage.xml
    M src/docbkx/en/content/maintenance/data_set/toc_dataset.xml

  Log Message:
  -----------
  Merge pull request #784 from dhis2/zubair-docs

added missing link to data set notification


  Commit: a470bf84a38629eb8de6b1be450c9c014964d950
      https://github.com/dhis2/dhis2-docs/commit/a470bf84a38629eb8de6b1be450c9c014964d950
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/tutorials/dhis2_tutorial_toc.xml
    A src/docbkx/en/content/tutorials/tutorial_textpattern.xml

  Log Message:
  -----------
  TextPattern tutorial and api-docs


  Commit: 76d5846323ae1654ac3d2a800006246328b6a2ec
      https://github.com/dhis2/dhis2-docs/commit/76d5846323ae1654ac3d2a800006246328b6a2ec
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/maintenance/tracker/tracked_entity/t_te_attribute_create.xml

  Log Message:
  -----------
  RenderingType, ObjectStyle, Experimental


  Commit: 41e1e15fb3ac07543494bb0b8b68ffa07f829fef
      https://github.com/dhis2/dhis2-docs/commit/41e1e15fb3ac07543494bb0b8b68ffa07f829fef
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_notification_manage.xml
    M src/docbkx/en/content/maintenance/data_set/toc_dataset.xml
    M src/docbkx/en/content/mobile/sms_command.xml
    A src/docbkx/en/resources/images/datasets/dataset_notification_create.png
    A src/docbkx/en/resources/images/datasets/when_to_send.png
    A src/docbkx/en/resources/images/datasets/who_to_send.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/TEI_parser.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/programstage_data_parser.png

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


  Commit: 4fac8d368db266f8a6bbaa0ef7f9eabbb4374512
      https://github.com/dhis2/dhis2-docs/commit/4fac8d368db266f8a6bbaa0ef7f9eabbb4374512
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/maintenance/tracker/tracked_entity/t_te_attribute_create.xml

  Log Message:
  -----------
  Merge pull request #780 from dhis2/kristian-docs

Image attributes and documents


  Commit: 36317f142e925c8db144cf226f2697d3f9e9a16b
      https://github.com/dhis2/dhis2-docs/commit/36317f142e925c8db144cf226f2697d3f9e9a16b
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_notification_manage.xml
    M src/docbkx/en/content/maintenance/data_set/toc_dataset.xml
    M src/docbkx/en/content/maintenance/tracker/tracked_entity/t_te_attribute_create.xml
    M src/docbkx/en/content/mobile/sms_command.xml
    A src/docbkx/en/resources/images/datasets/dataset_notification_create.png
    A src/docbkx/en/resources/images/datasets/when_to_send.png
    A src/docbkx/en/resources/images/datasets/who_to_send.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/TEI_parser.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/programstage_data_parser.png

  Log Message:
  -----------
  Merge branch 'master' into text-pattern


  Commit: b7ef018df52f54bd052a3d83a1eae1e430d8df49
      https://github.com/dhis2/dhis2-docs/commit/b7ef018df52f54bd052a3d83a1eae1e430d8df49
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/tutorials/dhis2_tutorial_toc.xml
    A src/docbkx/en/content/tutorials/tutorial_textpattern.xml

  Log Message:
  -----------
  Merge pull request #785 from dhis2/text-pattern

TextPattern tutorial and api-docs


  Commit: 9e8e2c46367d6ba8a53846482c6107ff36423e6e
      https://github.com/dhis2/dhis2-docs/commit/9e8e2c46367d6ba8a53846482c6107ff36423e6e
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/maintenance/tracker/tracked_entity/t_te_attribute_create.xml
    M src/docbkx/en/content/tutorials/dhis2_tutorial_toc.xml
    A src/docbkx/en/content/tutorials/tutorial_textpattern.xml

  Log Message:
  -----------
  Merge branch 'master' into render-type-object-style


  Commit: 03c977e48e7125893f0b4ae55dffaa5b811f815b
      https://github.com/dhis2/dhis2-docs/commit/03c977e48e7125893f0b4ae55dffaa5b811f815b
  Author: Kjetil Svalestuen <kjetil@xxxxxxxxx>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/data_admin/data_admin.xml
    M src/docbkx/en/resources/images/scheduler/add_new_job.png
    M src/docbkx/en/resources/images/scheduler/delete_job.png
    M src/docbkx/en/resources/images/scheduler/overview.png

  Log Message:
  -----------
  Improvements and updated screenshots


  Commit: 8678b3a96a60a6b681793dbce8fd30e94af1a6a9
      https://github.com/dhis2/dhis2-docs/commit/8678b3a96a60a6b681793dbce8fd30e94af1a6a9
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/maintenance/tracker/tracked_entity/t_te_attribute_create.xml

  Log Message:
  -----------
  Merge pull request #786 from dhis2/render-type-object-style

RenderingType, ObjectStyle, Experimental


  Commit: 5c22878adfb03acf8f493221bae6472b2b0dc95f
      https://github.com/dhis2/dhis2-docs/commit/5c22878adfb03acf8f493221bae6472b2b0dc95f
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    M .travis.yml
    M src/docbkx/en/content/approvals/approvals.xml
    M src/docbkx/en/content/dashboard/dashboard.xml
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/implementer/installation.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_notification_manage.xml
    M src/docbkx/en/content/maintenance/data_set/toc_dataset.xml
    M src/docbkx/en/content/maintenance/predictor/t_predictor_create.xml
    M src/docbkx/en/content/maintenance/tracker/tracked_entity/t_te_attribute_create.xml
    M src/docbkx/en/content/mobile/sms_command.xml
    M src/docbkx/en/content/tutorials/dhis2_tutorial_toc.xml
    A src/docbkx/en/content/tutorials/tutorial_textpattern.xml
    A src/docbkx/en/resources/images/datasets/dataset_notification_create.png
    A src/docbkx/en/resources/images/datasets/when_to_send.png
    A src/docbkx/en/resources/images/datasets/who_to_send.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/TEI_parser.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/programstage_data_parser.png

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


  Commit: 03ef215039be08e875345a4991e915054e107fc3
      https://github.com/dhis2/dhis2-docs/commit/03ef215039be08e875345a4991e915054e107fc3
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/data_admin/data_admin.xml
    A src/docbkx/en/resources/images/scheduler/add_new_job.png
    A src/docbkx/en/resources/images/scheduler/delete_job.png
    A src/docbkx/en/resources/images/scheduler/overview.png

  Log Message:
  -----------
  Merge pull request #778 from dhis2/scheduler-docs

Added docs for the scheduler app


  Commit: dd64fa1377a0decb448bde6732ed8a159a017fdd
      https://github.com/dhis2/dhis2-docs/commit/dd64fa1377a0decb448bde6732ed8a159a017fdd
  Author: Philip Anthony Larsen Donnelly <phil@xxxxxxxxx>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    A src/docbkx/en/content/analysis/maps/c_maps.xml
    A src/docbkx/en/content/analysis/maps/resources
    A src/docbkx/en/content/analysis/using_maps.xml
    M src/docbkx/en/content/maintenance/extmaplayer/t_extmaplayer_create.xml
    M src/docbkx/en/dhis2_end_user_manual.xml
    M src/docbkx/en/dhis2_user_manual_en.xml
    A src/docbkx/en/resources/images/maps/chart_integration.png
    A src/docbkx/en/resources/images/maps/labels_above_thematic_layers.png
    A src/docbkx/en/resources/images/maps/map-latitude-longitude.png
    A src/docbkx/en/resources/images/maps/map-temperature-landcover4.png
    A src/docbkx/en/resources/images/maps/map_main.png
    A src/docbkx/en/resources/images/maps/maps_administrative_boundaries.png
    A src/docbkx/en/resources/images/maps/maps_aerial_imagery.png
    A src/docbkx/en/resources/images/maps/maps_basemap_card.png
    A src/docbkx/en/resources/images/maps/maps_black_basemap_and_nighttime_lights.png
    A src/docbkx/en/resources/images/maps/maps_bound_layer_data_table.png
    A src/docbkx/en/resources/images/maps/maps_bound_layers.png
    A src/docbkx/en/resources/images/maps/maps_boundary_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_boundary_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_boundary_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_coordinates.png
    A src/docbkx/en/resources/images/maps/maps_earth_eng_layer.png
    A src/docbkx/en/resources/images/maps/maps_ee_layer_dialog_POPULATION.png
    A src/docbkx/en/resources/images/maps/maps_event_layer.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_DATA.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_FILTER.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_PERIOD.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_part.png
    A src/docbkx/en/resources/images/maps/maps_eventlayer_eventinfopopup.png
    A src/docbkx/en/resources/images/maps/maps_external_layers1.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_data_table.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_dialog_GROUPSET.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_favorites.png
    A src/docbkx/en/resources/images/maps/maps_favorites_menu.png
    A src/docbkx/en/resources/images/maps/maps_get_link.png
    A src/docbkx/en/resources/images/maps/maps_layer_selection.png
    A src/docbkx/en/resources/images/maps/maps_main.png
    A src/docbkx/en/resources/images/maps/maps_measure_distance.png
    A src/docbkx/en/resources/images/maps/maps_overlay_card.png
    A src/docbkx/en/resources/images/maps/maps_place_search.png
    A src/docbkx/en/resources/images/maps/maps_save_as.png
    A src/docbkx/en/resources/images/maps/maps_terrain_imagery.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_data_table0.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_data_table1.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_DATA.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_DATA0.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_DATA1.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_PERIOD.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_STYLE0.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_STYLE1.png
    A src/docbkx/en/resources/images/maps/maps_thematic_mapping.png
    A src/docbkx/en/resources/images/maps/maps_world_time_zones.png
    A src/docbkx/en/resources/images/maps/maps_write_interpretation.png
    A src/docbkx/en/resources/images/maps/old_gis_earth_engine_layer_population.png
    A src/docbkx/en/resources/images/maps/old_gis_external_layers2.png
    A src/docbkx/en/resources/images/maps/old_gis_main.png

  Log Message:
  -----------
  DHIS2-244 Improved, user friendly and modernised design of GIS app: Maps app documentation


  Commit: 3f78c13411f4b6492a2f9638cfd286c48f25db58
      https://github.com/dhis2/dhis2-docs/commit/3f78c13411f4b6492a2f9638cfd286c48f25db58
  Author: Philip-Larsen-Donnelly <35666657+Philip-Larsen-Donnelly@xxxxxxxxxxxxxxxxxxxxxxxx>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    M .travis.yml
    M src/docbkx/en/content/approvals/approvals.xml
    M src/docbkx/en/content/dashboard/dashboard.xml
    M src/docbkx/en/content/data_admin/data_admin.xml
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/implementer/installation.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_notification_manage.xml
    M src/docbkx/en/content/maintenance/data_set/toc_dataset.xml
    M src/docbkx/en/content/maintenance/predictor/t_predictor_create.xml
    M src/docbkx/en/content/maintenance/tracker/tracked_entity/t_te_attribute_create.xml
    M src/docbkx/en/content/mobile/sms_command.xml
    M src/docbkx/en/content/tutorials/dhis2_tutorial_toc.xml
    A src/docbkx/en/content/tutorials/tutorial_textpattern.xml
    A src/docbkx/en/resources/images/datasets/dataset_notification_create.png
    A src/docbkx/en/resources/images/datasets/when_to_send.png
    A src/docbkx/en/resources/images/datasets/who_to_send.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/TEI_parser.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/programstage_data_parser.png
    A src/docbkx/en/resources/images/scheduler/add_new_job.png
    A src/docbkx/en/resources/images/scheduler/delete_job.png
    A src/docbkx/en/resources/images/scheduler/overview.png

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


  Commit: 1e077f0c52c26346de46ec09b3706ff1cef2ab10
      https://github.com/dhis2/dhis2-docs/commit/1e077f0c52c26346de46ec09b3706ff1cef2ab10
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/tutorials/tutorial_textpattern.xml

  Log Message:
  -----------
  fixed a duplicate id


  Commit: be2f8c043d473e8c19ee5746c982c11771b1928f
      https://github.com/dhis2/dhis2-docs/commit/be2f8c043d473e8c19ee5746c982c11771b1928f
  Author: Philip Anthony Larsen Donnelly <phil@xxxxxxxxx>
  Date:   2018-03-03 (Sat, 03 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/intro/ug_overview.xml
    M src/docbkx/en/resources/images/maps/maps_bound_layer_data_table.png
    M src/docbkx/en/resources/images/maps/maps_facility_layer_data_table.png
    M src/docbkx/en/resources/images/maps/maps_thematic_layer_data_table0.png
    M src/docbkx/en/resources/images/maps/maps_thematic_layer_data_table1.png

  Log Message:
  -----------
  DHIS2-244 updates for Maps app documentation


  Commit: 562930328c0b6219c45058c5ec0d307c782de29e
      https://github.com/dhis2/dhis2-docs/commit/562930328c0b6219c45058c5ec0d307c782de29e
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/tutorials/tutorial_textpattern.xml

  Log Message:
  -----------
  Merge pull request #788 from dhis2/duplicate-id-fix-textpattern

fixed a duplicate id


  Commit: 01624425978ab4518f20b268b543c6b02ba7b868
      https://github.com/dhis2/dhis2-docs/commit/01624425978ab4518f20b268b543c6b02ba7b868
  Author: Kjetil Svalestuen <kjetil@xxxxxxxxx>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/data_admin/data_admin.xml
    R src/docbkx/en/resources/images/scheduler/add_new_job.png
    R src/docbkx/en/resources/images/scheduler/delete_job.png
    R src/docbkx/en/resources/images/scheduler/overview.png

  Log Message:
  -----------
  Revert "Added docs for the scheduler app"

This reverts commit ca0c691061087ef57b1d077db31d97ca1860dfd1.


  Commit: 5682b8d898176f6dc48a364705730edb3adff337
      https://github.com/dhis2/dhis2-docs/commit/5682b8d898176f6dc48a364705730edb3adff337
  Author: Kjetil Svalestuen <kjetil@xxxxxxxxx>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/maintenance/common/mtn_share.xml
    M src/docbkx/en/content/sharing/sharing.xml

  Log Message:
  -----------
  Improvements after review


  Commit: 311f35a1f831ac393745ef20e34b6b55079041cc
      https://github.com/dhis2/dhis2-docs/commit/311f35a1f831ac393745ef20e34b6b55079041cc
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M .travis.yml
    M src/docbkx/en/content/approvals/approvals.xml
    M src/docbkx/en/content/dashboard/dashboard.xml
    M src/docbkx/en/content/data_admin/data_admin.xml
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/implementer/installation.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_notification_manage.xml
    M src/docbkx/en/content/maintenance/data_set/toc_dataset.xml
    M src/docbkx/en/content/maintenance/predictor/t_predictor_create.xml
    M src/docbkx/en/content/maintenance/tracker/tracked_entity/t_te_attribute_create.xml
    M src/docbkx/en/content/mobile/sms_command.xml
    M src/docbkx/en/content/tutorials/dhis2_tutorial_toc.xml
    A src/docbkx/en/content/tutorials/tutorial_textpattern.xml
    A src/docbkx/en/resources/images/datasets/dataset_notification_create.png
    A src/docbkx/en/resources/images/datasets/when_to_send.png
    A src/docbkx/en/resources/images/datasets/who_to_send.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/TEI_parser.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/programstage_data_parser.png
    A src/docbkx/en/resources/images/scheduler/add_new_job.png
    A src/docbkx/en/resources/images/scheduler/delete_job.png
    A src/docbkx/en/resources/images/scheduler/overview.png

  Log Message:
  -----------
  merge


  Commit: b412fa9a433635497f70bc3d26f1f824d9e5b54c
      https://github.com/dhis2/dhis2-docs/commit/b412fa9a433635497f70bc3d26f1f824d9e5b54c
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/maintenance/common/mtn_share.xml
    M src/docbkx/en/content/sharing/sharing.xml

  Log Message:
  -----------
  Merge pull request #777 from dhis2/sharing-docs

Sharing docs


  Commit: b58caf3ad36ea6c4efe861571d41aa3de109d586
      https://github.com/dhis2/dhis2-docs/commit/b58caf3ad36ea6c4efe861571d41aa3de109d586
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/maintenance/common/mtn_share.xml
    M src/docbkx/en/content/sharing/sharing.xml
    M src/docbkx/en/content/tutorials/tutorial_textpattern.xml

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


  Commit: f42b3b7ccc602f1d6b851230d707e810c3957c4c
      https://github.com/dhis2/dhis2-docs/commit/f42b3b7ccc602f1d6b851230d707e810c3957c4c
  Author: Stian Sandvold <stian@xxxxxxxxx>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    A src/docbkx/en/content/analysis/maps/c_maps.xml
    A src/docbkx/en/content/analysis/maps/resources
    A src/docbkx/en/content/analysis/using_maps.xml
    M src/docbkx/en/content/intro/ug_overview.xml
    M src/docbkx/en/content/maintenance/extmaplayer/t_extmaplayer_create.xml
    M src/docbkx/en/dhis2_end_user_manual.xml
    M src/docbkx/en/dhis2_user_manual_en.xml
    A src/docbkx/en/resources/images/maps/chart_integration.png
    A src/docbkx/en/resources/images/maps/labels_above_thematic_layers.png
    A src/docbkx/en/resources/images/maps/map-latitude-longitude.png
    A src/docbkx/en/resources/images/maps/map-temperature-landcover4.png
    A src/docbkx/en/resources/images/maps/map_main.png
    A src/docbkx/en/resources/images/maps/maps_administrative_boundaries.png
    A src/docbkx/en/resources/images/maps/maps_aerial_imagery.png
    A src/docbkx/en/resources/images/maps/maps_basemap_card.png
    A src/docbkx/en/resources/images/maps/maps_black_basemap_and_nighttime_lights.png
    A src/docbkx/en/resources/images/maps/maps_bound_layer_data_table.png
    A src/docbkx/en/resources/images/maps/maps_bound_layers.png
    A src/docbkx/en/resources/images/maps/maps_boundary_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_boundary_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_boundary_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_coordinates.png
    A src/docbkx/en/resources/images/maps/maps_earth_eng_layer.png
    A src/docbkx/en/resources/images/maps/maps_ee_layer_dialog_POPULATION.png
    A src/docbkx/en/resources/images/maps/maps_event_layer.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_DATA.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_FILTER.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_PERIOD.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_part.png
    A src/docbkx/en/resources/images/maps/maps_eventlayer_eventinfopopup.png
    A src/docbkx/en/resources/images/maps/maps_external_layers1.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_data_table.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_dialog_GROUPSET.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_favorites.png
    A src/docbkx/en/resources/images/maps/maps_favorites_menu.png
    A src/docbkx/en/resources/images/maps/maps_get_link.png
    A src/docbkx/en/resources/images/maps/maps_layer_selection.png
    A src/docbkx/en/resources/images/maps/maps_main.png
    A src/docbkx/en/resources/images/maps/maps_measure_distance.png
    A src/docbkx/en/resources/images/maps/maps_overlay_card.png
    A src/docbkx/en/resources/images/maps/maps_place_search.png
    A src/docbkx/en/resources/images/maps/maps_save_as.png
    A src/docbkx/en/resources/images/maps/maps_terrain_imagery.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_data_table0.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_data_table1.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_DATA.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_DATA0.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_DATA1.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_PERIOD.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_STYLE0.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_STYLE1.png
    A src/docbkx/en/resources/images/maps/maps_thematic_mapping.png
    A src/docbkx/en/resources/images/maps/maps_world_time_zones.png
    A src/docbkx/en/resources/images/maps/maps_write_interpretation.png
    A src/docbkx/en/resources/images/maps/old_gis_earth_engine_layer_population.png
    A src/docbkx/en/resources/images/maps/old_gis_external_layers2.png
    A src/docbkx/en/resources/images/maps/old_gis_main.png

  Log Message:
  -----------
  Merge pull request #787 from Philip-Larsen-Donnelly/master

Maps app documentation


  Commit: 58c679e4f9362a36eaaac12d7c6a62901057318a
      https://github.com/dhis2/dhis2-docs/commit/58c679e4f9362a36eaaac12d7c6a62901057318a
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

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

  Log Message:
  -----------
  placeholder for metadata audit api


  Commit: 9ad6c22b8b20837c8a2d2574ea0a052a38f1e9ca
      https://github.com/dhis2/dhis2-docs/commit/9ad6c22b8b20837c8a2d2574ea0a052a38f1e9ca
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

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

  Log Message:
  -----------
  Merge pull request #789 from dhis2/metadataaudit-docs

placeholder for metadata audit api


  Commit: 6ae628bb65985ea36d8595a445867ec427ea7448
      https://github.com/dhis2/dhis2-docs/commit/6ae628bb65985ea36d8595a445867ec427ea7448
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

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

  Log Message:
  -----------
  audit docs


  Commit: cb28db58ea8f48d7ab9b7f1eebf8b54cd9d5f697
      https://github.com/dhis2/dhis2-docs/commit/cb28db58ea8f48d7ab9b7f1eebf8b54cd9d5f697
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

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


  Commit: 29a68e8a3068f3d1a02798c122122a8d6c9897a9
      https://github.com/dhis2/dhis2-docs/commit/29a68e8a3068f3d1a02798c122122a8d6c9897a9
  Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

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

  Log Message:
  -----------
  Merge pull request #791 from dhis2/metadataaudit-docs

audit docs


  Commit: 7187f3f50478d7fde5d26654e9baecb68c60f45e
      https://github.com/dhis2/dhis2-docs/commit/7187f3f50478d7fde5d26654e9baecb68c60f45e
  Author: Bekkalizer <markus.bekken@xxxxxxxxx>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/events/tracker_capture.xml

  Log Message:
  -----------
  Formatting


  Commit: 597fde445fe7cfbdd365bc5f4d85fc2c141ba6c5
      https://github.com/dhis2/dhis2-docs/commit/597fde445fe7cfbdd365bc5f4d85fc2c141ba6c5
  Author: Bekkalizer <markus.bekken@xxxxxxxxx>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/maintenance/data_element/t_datael_create.xml

  Log Message:
  -----------
  Formatting


  Commit: d2ccb2e50e2068c9ebf3ca242e68cb2f9aac008e
      https://github.com/dhis2/dhis2-docs/commit/d2ccb2e50e2068c9ebf3ca242e68cb2f9aac008e
  Author: Bekkalizer <markus.bekken@xxxxxxxxx>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    A src/docbkx/en/content/analysis/maps/c_maps.xml
    A src/docbkx/en/content/analysis/maps/resources
    A src/docbkx/en/content/analysis/using_maps.xml
    M src/docbkx/en/content/data_admin/data_admin.xml
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/implementer/installation.xml
    M src/docbkx/en/content/intro/ug_overview.xml
    M src/docbkx/en/content/maintenance/common/mtn_share.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_notification_manage.xml
    M src/docbkx/en/content/maintenance/data_set/toc_dataset.xml
    M src/docbkx/en/content/maintenance/extmaplayer/t_extmaplayer_create.xml
    M src/docbkx/en/content/maintenance/predictor/t_predictor_create.xml
    M src/docbkx/en/content/maintenance/tracker/tracked_entity/t_te_attribute_create.xml
    M src/docbkx/en/content/mobile/sms_command.xml
    M src/docbkx/en/content/sharing/sharing.xml
    M src/docbkx/en/content/tutorials/dhis2_tutorial_toc.xml
    A src/docbkx/en/content/tutorials/tutorial_textpattern.xml
    M src/docbkx/en/dhis2_end_user_manual.xml
    M src/docbkx/en/dhis2_user_manual_en.xml
    A src/docbkx/en/resources/images/datasets/dataset_notification_create.png
    A src/docbkx/en/resources/images/datasets/when_to_send.png
    A src/docbkx/en/resources/images/datasets/who_to_send.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/TEI_parser.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/programstage_data_parser.png
    A src/docbkx/en/resources/images/maps/chart_integration.png
    A src/docbkx/en/resources/images/maps/labels_above_thematic_layers.png
    A src/docbkx/en/resources/images/maps/map-latitude-longitude.png
    A src/docbkx/en/resources/images/maps/map-temperature-landcover4.png
    A src/docbkx/en/resources/images/maps/map_main.png
    A src/docbkx/en/resources/images/maps/maps_administrative_boundaries.png
    A src/docbkx/en/resources/images/maps/maps_aerial_imagery.png
    A src/docbkx/en/resources/images/maps/maps_basemap_card.png
    A src/docbkx/en/resources/images/maps/maps_black_basemap_and_nighttime_lights.png
    A src/docbkx/en/resources/images/maps/maps_bound_layer_data_table.png
    A src/docbkx/en/resources/images/maps/maps_bound_layers.png
    A src/docbkx/en/resources/images/maps/maps_boundary_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_boundary_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_boundary_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_coordinates.png
    A src/docbkx/en/resources/images/maps/maps_earth_eng_layer.png
    A src/docbkx/en/resources/images/maps/maps_ee_layer_dialog_POPULATION.png
    A src/docbkx/en/resources/images/maps/maps_event_layer.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_DATA.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_FILTER.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_PERIOD.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_part.png
    A src/docbkx/en/resources/images/maps/maps_eventlayer_eventinfopopup.png
    A src/docbkx/en/resources/images/maps/maps_external_layers1.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_data_table.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_dialog_GROUPSET.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_favorites.png
    A src/docbkx/en/resources/images/maps/maps_favorites_menu.png
    A src/docbkx/en/resources/images/maps/maps_get_link.png
    A src/docbkx/en/resources/images/maps/maps_layer_selection.png
    A src/docbkx/en/resources/images/maps/maps_main.png
    A src/docbkx/en/resources/images/maps/maps_measure_distance.png
    A src/docbkx/en/resources/images/maps/maps_overlay_card.png
    A src/docbkx/en/resources/images/maps/maps_place_search.png
    A src/docbkx/en/resources/images/maps/maps_save_as.png
    A src/docbkx/en/resources/images/maps/maps_terrain_imagery.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_data_table0.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_data_table1.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_DATA.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_DATA0.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_DATA1.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_PERIOD.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_STYLE0.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_STYLE1.png
    A src/docbkx/en/resources/images/maps/maps_thematic_mapping.png
    A src/docbkx/en/resources/images/maps/maps_world_time_zones.png
    A src/docbkx/en/resources/images/maps/maps_write_interpretation.png
    A src/docbkx/en/resources/images/maps/old_gis_earth_engine_layer_population.png
    A src/docbkx/en/resources/images/maps/old_gis_external_layers2.png
    A src/docbkx/en/resources/images/maps/old_gis_main.png
    A src/docbkx/en/resources/images/scheduler/add_new_job.png
    A src/docbkx/en/resources/images/scheduler/delete_job.png
    A src/docbkx/en/resources/images/scheduler/overview.png

  Log Message:
  -----------
  Merge branch 'master' into lukasewvd-documentation


  Commit: 58f04f1e664ffcc61497d260b5c4eceeae6aea1a
      https://github.com/dhis2/dhis2-docs/commit/58f04f1e664ffcc61497d260b5c4eceeae6aea1a
  Author: Bekkalizer <markus.bekken@xxxxxxxxx>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M src/docbkx/en/resources/images/tracker_capture/top_bar.png

  Log Message:
  -----------
  Cropping


  Commit: 445c839db1d1e9abe4239b389fcab00b61186d94
      https://github.com/dhis2/dhis2-docs/commit/445c839db1d1e9abe4239b389fcab00b61186d94
  Author: Bekkalizer <markus.bekken@xxxxxxxxx>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/events/tracker_capture.xml
    M src/docbkx/en/content/maintenance/data_element/t_datael_create.xml
    A src/docbkx/en/resources/images/tracker_capture/compareForm.png
    A src/docbkx/en/resources/images/tracker_capture/top_bar.png

  Log Message:
  -----------
  Merge pull request #790 from dhis2/lukasewvd-documentation

Added some documentation for tracker-capture


  Commit: 535c84bb7c011471283a606f5a8fad83be89392e
      https://github.com/dhis2/dhis2-docs/commit/535c84bb7c011471283a606f5a8fad83be89392e
  Author: zepto5 <andre.hukkelaas@xxxxxxxxx>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    A src/docbkx/en/content/analysis/maps/c_maps.xml
    A src/docbkx/en/content/analysis/maps/resources
    A src/docbkx/en/content/analysis/using_maps.xml
    M src/docbkx/en/content/data_admin/data_admin.xml
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/events/tracker_capture.xml
    M src/docbkx/en/content/implementer/installation.xml
    M src/docbkx/en/content/intro/ug_overview.xml
    M src/docbkx/en/content/maintenance/common/mtn_share.xml
    M src/docbkx/en/content/maintenance/data_element/t_datael_create.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_notification_manage.xml
    M src/docbkx/en/content/maintenance/data_set/toc_dataset.xml
    M src/docbkx/en/content/maintenance/extmaplayer/t_extmaplayer_create.xml
    M src/docbkx/en/content/maintenance/predictor/t_predictor_create.xml
    M src/docbkx/en/content/maintenance/tracker/tracked_entity/t_te_attribute_create.xml
    M src/docbkx/en/content/mobile/sms_command.xml
    M src/docbkx/en/content/sharing/sharing.xml
    M src/docbkx/en/content/tutorials/dhis2_tutorial_toc.xml
    A src/docbkx/en/content/tutorials/tutorial_textpattern.xml
    M src/docbkx/en/dhis2_end_user_manual.xml
    M src/docbkx/en/dhis2_user_manual_en.xml
    A src/docbkx/en/resources/images/datasets/dataset_notification_create.png
    A src/docbkx/en/resources/images/datasets/when_to_send.png
    A src/docbkx/en/resources/images/datasets/who_to_send.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/TEI_parser.png
    A src/docbkx/en/resources/images/dhis2_mobile_sms/programstage_data_parser.png
    A src/docbkx/en/resources/images/maps/chart_integration.png
    A src/docbkx/en/resources/images/maps/labels_above_thematic_layers.png
    A src/docbkx/en/resources/images/maps/map-latitude-longitude.png
    A src/docbkx/en/resources/images/maps/map-temperature-landcover4.png
    A src/docbkx/en/resources/images/maps/map_main.png
    A src/docbkx/en/resources/images/maps/maps_administrative_boundaries.png
    A src/docbkx/en/resources/images/maps/maps_aerial_imagery.png
    A src/docbkx/en/resources/images/maps/maps_basemap_card.png
    A src/docbkx/en/resources/images/maps/maps_black_basemap_and_nighttime_lights.png
    A src/docbkx/en/resources/images/maps/maps_bound_layer_data_table.png
    A src/docbkx/en/resources/images/maps/maps_bound_layers.png
    A src/docbkx/en/resources/images/maps/maps_boundary_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_boundary_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_boundary_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_coordinates.png
    A src/docbkx/en/resources/images/maps/maps_earth_eng_layer.png
    A src/docbkx/en/resources/images/maps/maps_ee_layer_dialog_POPULATION.png
    A src/docbkx/en/resources/images/maps/maps_event_layer.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_DATA.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_FILTER.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_PERIOD.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_event_layer_part.png
    A src/docbkx/en/resources/images/maps/maps_eventlayer_eventinfopopup.png
    A src/docbkx/en/resources/images/maps/maps_external_layers1.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_data_table.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_dialog_GROUPSET.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_facility_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_favorites.png
    A src/docbkx/en/resources/images/maps/maps_favorites_menu.png
    A src/docbkx/en/resources/images/maps/maps_get_link.png
    A src/docbkx/en/resources/images/maps/maps_layer_selection.png
    A src/docbkx/en/resources/images/maps/maps_main.png
    A src/docbkx/en/resources/images/maps/maps_measure_distance.png
    A src/docbkx/en/resources/images/maps/maps_overlay_card.png
    A src/docbkx/en/resources/images/maps/maps_place_search.png
    A src/docbkx/en/resources/images/maps/maps_save_as.png
    A src/docbkx/en/resources/images/maps/maps_terrain_imagery.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_card.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_data_table0.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_data_table1.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_DATA.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_DATA0.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_DATA1.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_ORG_UNITS.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_PERIOD.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_STYLE.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_STYLE0.png
    A src/docbkx/en/resources/images/maps/maps_thematic_layer_dialog_STYLE1.png
    A src/docbkx/en/resources/images/maps/maps_thematic_mapping.png
    A src/docbkx/en/resources/images/maps/maps_world_time_zones.png
    A src/docbkx/en/resources/images/maps/maps_write_interpretation.png
    A src/docbkx/en/resources/images/maps/old_gis_earth_engine_layer_population.png
    A src/docbkx/en/resources/images/maps/old_gis_external_layers2.png
    A src/docbkx/en/resources/images/maps/old_gis_main.png
    A src/docbkx/en/resources/images/scheduler/add_new_job.png
    A src/docbkx/en/resources/images/scheduler/delete_job.png
    A src/docbkx/en/resources/images/scheduler/overview.png
    A src/docbkx/en/resources/images/tracker_capture/compareForm.png
    A src/docbkx/en/resources/images/tracker_capture/top_bar.png

  Log Message:
  -----------
  Merge branch 'master' into doc-search


Compare: https://github.com/dhis2/dhis2-docs/compare/7c0f1248b4de...535c84bb7c01