← Back to team overview

dhis2-documenters team mailing list archive

[dhis2/dhis2-docs] 9b6ac2: Merge remote-tracking branch 'refs/remotes/origin/...

 

  Branch: refs/heads/scorecards
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: 9b6ac29f8c3239763772b56b2beefde7cde8bcd7
      https://github.com/dhis2/dhis2-docs/commit/9b6ac29f8c3239763772b56b2beefde7cde8bcd7
  Author: rachbrooke <rachael@xxxxxxxxx>
  Date:   2016-12-09 (Fri, 09 Dec 2016)

  Changed paths:
    R .gitmodules
    M src/docbkx/en/content/android/config_program.xml
    M src/docbkx/en/content/dashboard/dashboard.xml
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/maintenance/attribute/toc_attribute.xml
    M src/docbkx/en/content/maintenance/category/c_category.xml
    M src/docbkx/en/content/maintenance/category/t_cat_combo_create.xml
    M src/docbkx/en/content/maintenance/category/t_cat_combo_for_datasets.xml
    M src/docbkx/en/content/maintenance/category/t_cat_create.xml
    M src/docbkx/en/content/maintenance/category/t_cat_option_combo_assigncode.xml
    M src/docbkx/en/content/maintenance/category/t_cat_option_create.xml
    M src/docbkx/en/content/maintenance/category/t_cat_option_gr_create.xml
    M src/docbkx/en/content/maintenance/category/t_cat_option_gr_set_create.xml
    M src/docbkx/en/content/maintenance/category/wf_category.xml
    M src/docbkx/en/content/maintenance/common/mtn_delete.xml
    M src/docbkx/en/content/maintenance/common/mtn_share.xml
    M src/docbkx/en/content/maintenance/common/mtn_translate.xml
    M src/docbkx/en/content/maintenance/constant/toc_constant.xml
    M src/docbkx/en/content/maintenance/data_element/c_datael.xml
    M src/docbkx/en/content/maintenance/data_element/t_datael_create.xml
    M src/docbkx/en/content/maintenance/data_element/t_dataelgroup_create.xml
    M src/docbkx/en/content/maintenance/data_element/t_dataelgroupset_create.xml
    M src/docbkx/en/content/maintenance/data_element/toc_datael.xml
    M src/docbkx/en/content/maintenance/data_element/wf_datael.xml
    M src/docbkx/en/content/maintenance/data_set/c_dataset.xml
    A src/docbkx/en/content/maintenance/data_set/t_customform_manage.xml
    M src/docbkx/en/content/maintenance/data_set/t_dataset_create.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_editcomp_de.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_override_catcombo.xml
    R src/docbkx/en/content/maintenance/data_set/t_dataset_task.xml
    A src/docbkx/en/content/maintenance/data_set/t_defaultform_download.xml
    A src/docbkx/en/content/maintenance/data_set/t_sectionform_manage.xml
    M src/docbkx/en/content/maintenance/data_set/toc_dataset.xml
    M src/docbkx/en/content/maintenance/data_set/wf_dataset.xml
    M src/docbkx/en/content/maintenance/legend/toc_legend.xml
    M src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml
    R src/docbkx/en/content/maintenance/mtn_data_set.xml
    M src/docbkx/en/content/maintenance/mtn_features_not_included.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml
    M src/docbkx/en/content/maintenance/option_set/toc_option_set.xml
    M src/docbkx/en/content/maintenance/org_unit/t_orgunit_create.xml
    M src/docbkx/en/content/maintenance/org_unit/t_orgunit_level_name.xml
    M src/docbkx/en/content/maintenance/org_unit/t_orgunit_move.xml
    M src/docbkx/en/content/maintenance/org_unit/t_orgunitgroup_create.xml
    M src/docbkx/en/content/maintenance/org_unit/t_orgunitgroupset_create.xml
    M src/docbkx/en/content/maintenance/predictor/toc_predictor.xml
    M src/docbkx/en/content/maintenance/push_analysis/c_push_analysis.xml
    M src/docbkx/en/content/maintenance/push_analysis/t_push_analysis_create.xml
    M src/docbkx/en/content/maintenance/push_analysis/t_push_analysis_preview.xml
    M src/docbkx/en/content/maintenance/push_analysis/t_push_analysis_run.xml
    M src/docbkx/en/content/maintenance/push_analysis/toc_push_analysis.xml
    M src/docbkx/en/content/maintenance/tracker/c_mtn_tracker.xml
    M src/docbkx/en/content/maintenance/tracker/t_reltype_create.xml
    M src/docbkx/en/content/maintenance/tracker/t_te_attribute_create.xml
    M src/docbkx/en/content/maintenance/tracker/t_te_attributegr_create.xml
    M src/docbkx/en/content/user_management/c_user_mgt.xml
    M src/docbkx/en/content/user_management/toc_user_mgt.xml
    A src/docbkx/en/resources/images/android/common/config_program_orgunit_setting.png
    A src/docbkx/en/resources/images/android/common/config_program_user_setting.png
    A src/docbkx/en/resources/images/android/common/config_program_userrole_setting.png
    A src/docbkx/en/resources/images/dashboard/dashboard_messages_manage.png
    M src/docbkx/en/resources/images/dashboard/dashboard_messages_queue.png
    A src/docbkx/en/resources/images/dashboard/dashboard_messages_queue_old.png

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master' into tutorial