← Back to team overview

dhis2-documenters team mailing list archive

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

 

  Branch: refs/heads/use-cases
  Home:   https://github.com/dhis2/dhis2-docs
  Commit: f104630bbf139be9241536e5a1a0dd31ed4d2faa
      https://github.com/dhis2/dhis2-docs/commit/f104630bbf139be9241536e5a1a0dd31ed4d2faa
  Author: rachael <rachael@xxxxxxxxx>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Changed paths:
    M .travis.yml
    M .utility/sitemap.xml
    A Jenkinsfile
    M pom.xml
    M src/docbkx/en/content/android/config_program.xml
    M src/docbkx/en/content/developer/web_api.xml
    M src/docbkx/en/content/maintenance/common/mtn_clone.xml
    M src/docbkx/en/content/maintenance/common/mtn_delete.xml
    M src/docbkx/en/content/maintenance/common/mtn_edit.xml
    M src/docbkx/en/content/maintenance/common/mtn_translate.xml
    A src/docbkx/en/content/maintenance/data_element/c_datael.xml
    A src/docbkx/en/content/maintenance/data_element/t_datael_create.xml
    A src/docbkx/en/content/maintenance/data_element/t_dataelgroup_create.xml
    A src/docbkx/en/content/maintenance/data_element/t_dataelgroupset_create.xml
    A src/docbkx/en/content/maintenance/data_element/toc_datael.xml
    A src/docbkx/en/content/maintenance/data_element/wf_datael.xml
    A src/docbkx/en/content/maintenance/data_set/c_dataset.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_create.xml
    A src/docbkx/en/content/maintenance/data_set/t_dataset_task.xml
    A src/docbkx/en/content/maintenance/data_set/toc_dataset.xml
    A src/docbkx/en/content/maintenance/data_set/wf_dataset.xml
    A src/docbkx/en/content/maintenance/indicator/c_indicator.xml
    A src/docbkx/en/content/maintenance/indicator/t_indicator_create.xml
    A src/docbkx/en/content/maintenance/indicator/t_indicatorgroup_create.xml
    A src/docbkx/en/content/maintenance/indicator/t_indicatorgroupset_create.xml
    A src/docbkx/en/content/maintenance/indicator/t_indicatortype_create.xml
    A src/docbkx/en/content/maintenance/indicator/toc_indicator.xml
    A src/docbkx/en/content/maintenance/indicator/wf_indicator.xml
    R src/docbkx/en/content/maintenance/mtn_data_element.xml
    R src/docbkx/en/content/maintenance/mtn_indicator.xml
    R src/docbkx/en/content/maintenance/mtn_org_unit.xml
    R src/docbkx/en/content/maintenance/mtn_program.xml
    M src/docbkx/en/content/maintenance/mtn_toc.xml
    A src/docbkx/en/content/maintenance/org_unit/c_orgunit.xml
    A src/docbkx/en/content/maintenance/org_unit/t_orgunit_create.xml
    A src/docbkx/en/content/maintenance/org_unit/t_orgunit_level_name.xml
    A src/docbkx/en/content/maintenance/org_unit/t_orgunit_move.xml
    A src/docbkx/en/content/maintenance/org_unit/t_orgunitgroup_create.xml
    A src/docbkx/en/content/maintenance/org_unit/t_orgunitgroupset_create.xml
    A src/docbkx/en/content/maintenance/org_unit/toc_orgunit.xml
    A src/docbkx/en/content/maintenance/org_unit/wf_orgunit.xml
    M src/docbkx/en/content/sharing/sharing.xml
    M src/docbkx/en/content/user_management/c_user_mgt.xml
    M src/docbkx/en/content/user_management/c_user_mgt_ex.xml
    M src/docbkx/en/content/user_management/common/user_share.xml
    M src/docbkx/en/content/user_management/t_mgt_other_users.xml
    M src/docbkx/en/content/user_management/t_open_id.xml
    M src/docbkx/en/content/user_management/user/t_user_create.xml
    M src/docbkx/en/content/user_management/user/toc_user.xml
    M src/docbkx/en/content/user_management/user_role/t_userrole_create.xml
    M src/docbkx/en/content/user_stories/user_stories_book.xml

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


  Commit: b716dc29340f3fa7b8d8df6c03a42aec825561d7
      https://github.com/dhis2/dhis2-docs/commit/b716dc29340f3fa7b8d8df6c03a42aec825561d7
  Author: rachael <rachael@xxxxxxxxx>
  Date:   2016-11-28 (Mon, 28 Nov 2016)

  Log Message:
  -----------
  Merge branch 'use-cases' of https://github.com/dhis2/dhis2-docs into use-cases


Compare: https://github.com/dhis2/dhis2-docs/compare/2ad8af1bfab4...b716dc29340f