dhis2-documenters team mailing list archive

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

To: dhis2-documenters@xxxxxxxxxxxxxxxxxxx
From: Stian Sandvold <stian@xxxxxxxxx>
Date: Sun, 04 Mar 2018 10:18:29 -0800
Reply-to: Stian Sandvold <stian@xxxxxxxxx>
Sender: stian=dhis2.org@xxxxxxxxxx
  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 <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: 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: 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: 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


Compare: https://github.com/dhis2/dhis2-docs/compare/b412fa9a4336...f42b3b7ccc60