dhis2-documenters team mailing list archive

[Bekkalizer <markus.bekken@xxxxxxxxx>]

  Branch: refs/heads/master
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: dcccb27d0693a15901e7c7ccf06bbe4f53b5bb17
      https://github.com/dhis2/dhis2-docs/commit/dcccb27d0693a15901e7c7ccf06bbe4f53b5bb17
  Author: Bekkalizer <markus.bekken@xxxxxxxxx>
  Date:   2018-01-05 (Fri, 05 Jan 2018)

  Changed paths:
    M src/docbkx/en/content/maintenance/tracker/pg_rule/r_pg_rule_expression.xml

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


  Commit: e48ad40e8236f3da596de060f0472f32c2d7342c
      https://github.com/dhis2/dhis2-docs/commit/e48ad40e8236f3da596de060f0472f32c2d7342c
  Author: Bekkalizer <markus.bekken@xxxxxxxxx>
  Date:   2018-01-05 (Fri, 05 Jan 2018)

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


  Commit: 116a92959a65a104e91aeb6f8034e66415a8ad26
      https://github.com/dhis2/dhis2-docs/commit/116a92959a65a104e91aeb6f8034e66415a8ad26
  Author: Bekkalizer <markus.bekken@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/data_admin/data_admin.xml
    M src/docbkx/en/content/developer/apps.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/samples_predictor.xml
    M src/docbkx/en/content/maintenance/predictor/t_predictor_create.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/maintenance/tracker/tracked_entity/t_te_attribute_create.xml
    M src/docbkx/en/content/mobile/sms_command.xml
    M src/docbkx/en/content/settings/settings.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 markus-docs


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

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

  Log Message:
  -----------
  Pretty-print


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

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

  Log Message:
  -----------
  Updates to support data sharing levels


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

  Changed paths:
    M src/docbkx/en/content/maintenance/tracker/pg_indicator/c_pg_indicator.xml

  Log Message:
  -----------
  Fixed syntax


  Commit: 3bf5f9f672923c362ce5be42f69434807feeea48
      https://github.com/dhis2/dhis2-docs/commit/3bf5f9f672923c362ce5be42f69434807feeea48
  Author: Bekkalizer <markus.bekken@xxxxxxxxx>
  Date:   2018-03-07 (Wed, 07 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/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
    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/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/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
    A src/docbkx/en/resources/images/tracker_capture/tracker_capture_lists.png
    A src/docbkx/en/resources/images/tracker_capture/tracker_capture_lists_custom.png
    A src/docbkx/en/resources/images/tracker_capture/tracker_capture_lists_download.png
    A src/docbkx/en/resources/images/tracker_capture/tracker_capture_register_integrated_search.png
    A src/docbkx/en/resources/images/tracker_capture/tracker_capture_search_screen.png

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

# Conflicts:
#	src/docbkx/en/content/sharing/sharing.xml


  Commit: 42c504bfbe9b27455eaff066d46b40226a4988c1
      https://github.com/dhis2/dhis2-docs/commit/42c504bfbe9b27455eaff066d46b40226a4988c1
  Author: Bekkalizer <markus.bekken@xxxxxxxxx>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M src/docbkx/en/content/maintenance/tracker/pg_indicator/c_pg_indicator.xml
    M src/docbkx/en/content/maintenance/tracker/pg_rule/r_pg_rule_expression.xml
    M src/docbkx/en/content/sharing/sharing.xml

  Log Message:
  -----------
  Merge pull request #792 from dhis2/markus-docs

Data sharing levels


Compare: https://github.com/dhis2/dhis2-docs/compare/57d778bc2655...42c504bfbe9b