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

2018-05-08 Thread zepto5
  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 
<3557+philip-larsen-donne...@users.noreply.github.com>
  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 
  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 
  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 
  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 
  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 
  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 
  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 
  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 
  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 
  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 
  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: 

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

2018-03-05 Thread Bekkalizer
  Branch: refs/heads/lukasewvd-documentation
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: e14ae8c7f57b4379e88d21ea0c1fce610c819939
  
https://github.com/dhis2/dhis2-docs/commit/e14ae8c7f57b4379e88d21ea0c1fce610c819939
  Author: Philip-Larsen-Donnelly 
<3557+philip-larsen-donne...@users.noreply.github.com>
  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 
  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: b12bc559d1536bc69633f63ab2467d3250da85c4
  
https://github.com/dhis2/dhis2-docs/commit/b12bc559d1536bc69633f63ab2467d3250da85c4
  Author: Ameen 
  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 
  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 
  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 
  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 
  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 
  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 
  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 
  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 
  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
  

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

2018-03-04 Thread Stian Sandvold
  Branch: refs/heads/master
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: e14ae8c7f57b4379e88d21ea0c1fce610c819939
  
https://github.com/dhis2/dhis2-docs/commit/e14ae8c7f57b4379e88d21ea0c1fce610c819939
  Author: Philip-Larsen-Donnelly 
<3557+philip-larsen-donne...@users.noreply.github.com>
  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: dd64fa1377a0decb448bde6732ed8a159a017fdd
  
https://github.com/dhis2/dhis2-docs/commit/dd64fa1377a0decb448bde6732ed8a159a017fdd
  Author: Philip Anthony Larsen Donnelly 
  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