[Dhis2-documenters] [dhis2/dhis2-docs] 64532e: Merge branch 'master' into docinprogress
Branch: refs/heads/docinprogress Home: https://github.com/dhis2/dhis2-docs Commit: 64532e0b013c7b5cc3bb2d3fb36bce82adbf78fa https://github.com/dhis2/dhis2-docs/commit/64532e0b013c7b5cc3bb2d3fb36bce82adbf78fa Author: Cecilia Persson Date: 2016-06-20 (Mon, 20 Jun 2016) Changed paths: M .travis.yml Log Message: --- Merge branch 'master' into docinprogress Commit: bddc95ac14d4c6155d469f02de12110c7378d163 https://github.com/dhis2/dhis2-docs/commit/bddc95ac14d4c6155d469f02de12110c7378d163 Author: Cecilia Persson Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M src/docbkx/en/dhis2_documentation_guide.xml M src/docbkx/en/dhis2_user_man_data_elements.xml M src/docbkx/en/dhis2_user_man_orgunits.xml M src/docbkx/en/dhis2_user_man_web_api.xml Log Message: --- Merge remote-tracking branch 'origin/docinprogress' into docinprogress Compare: https://github.com/dhis2/dhis2-docs/compare/9fbb4433b527...bddc95ac14d4___ Mailing list: https://launchpad.net/~dhis2-documenters Post to : dhis2-documenters@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-documenters More help : https://help.launchpad.net/ListHelp
[Dhis2-documenters] [dhis2/dhis2-docs] 64532e: Merge branch 'master' into docinprogress
Branch: refs/heads/ticketing Home: https://github.com/dhis2/dhis2-docs Commit: 64532e0b013c7b5cc3bb2d3fb36bce82adbf78fa https://github.com/dhis2/dhis2-docs/commit/64532e0b013c7b5cc3bb2d3fb36bce82adbf78fa Author: Cecilia Persson Date: 2016-06-20 (Mon, 20 Jun 2016) Changed paths: M .travis.yml Log Message: --- Merge branch 'master' into docinprogress Commit: c696cd59c0cffecff0861ecfa2f1084592f824ed https://github.com/dhis2/dhis2-docs/commit/c696cd59c0cffecff0861ecfa2f1084592f824ed Author: Jason P. Pickering Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M src/docbkx/en/dhis2_user_man_web_api.xml Log Message: --- Change query program messages API to a table. Commit: 9fbb4433b5270e60e530b7944fc2875f27538cb5 https://github.com/dhis2/dhis2-docs/commit/9fbb4433b5270e60e530b7944fc2875f27538cb5 Author: Jason P. Pickering Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M src/docbkx/en/dhis2_user_man_web_api.xml Log Message: --- Minor. Commit: bddc95ac14d4c6155d469f02de12110c7378d163 https://github.com/dhis2/dhis2-docs/commit/bddc95ac14d4c6155d469f02de12110c7378d163 Author: Cecilia Persson Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M src/docbkx/en/dhis2_documentation_guide.xml M src/docbkx/en/dhis2_user_man_data_elements.xml M src/docbkx/en/dhis2_user_man_orgunits.xml M src/docbkx/en/dhis2_user_man_web_api.xml Log Message: --- Merge remote-tracking branch 'origin/docinprogress' into docinprogress Commit: c2499248af8501164369452d645b53ddd1a3b75b https://github.com/dhis2/dhis2-docs/commit/c2499248af8501164369452d645b53ddd1a3b75b Author: Cecilia Persson Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: A src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml A src/docbkx/en/content/maintenance/mtn_toc.xml A src/docbkx/en/content/maintenance/test_book.xml R src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml R src/docbkx/en/resources/maintenance/mtn_toc.xml R src/docbkx/en/resources/maintenance/test_book.xml Log Message: --- Create new content folder and added Maintenance folder Commit: a42ad97344138fc3d686c8c5ee62cc606b283428 https://github.com/dhis2/dhis2-docs/commit/a42ad97344138fc3d686c8c5ee62cc606b283428 Author: Cecilia Persson Date: 2016-06-21 (Tue, 21 Jun 2016) Log Message: --- Merge branch 'master' into docinprogress Commit: c57ad798aa5c378b346b45081e3f254c85837af1 https://github.com/dhis2/dhis2-docs/commit/c57ad798aa5c378b346b45081e3f254c85837af1 Author: Cecilia Persson Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M src/docbkx/en/dhis2_user_man_datasets_forms.xml Log Message: --- Man app: Data sets - minor edits concept info Commit: 650731042ed000367889467231aee7be21e87302 https://github.com/dhis2/dhis2-docs/commit/650731042ed000367889467231aee7be21e87302 Author: Cecilia Persson Date: 2016-06-22 (Wed, 22 Jun 2016) Changed paths: M .travis.yml M .utility/deploy.sh M src/docbkx/en/dhis2_user_man_mobile_sms_command.xml M src/docbkx/en/dhis2_user_man_web_api.xml A src/docbkx/en/resources/images/dhis2_mobile_sms/event-registration-parser.png Log Message: --- Merge branch 'master' into docinprogress Commit: 401c006027df10942a74f4e5750fa95384c0d40a https://github.com/dhis2/dhis2-docs/commit/401c006027df10942a74f4e5750fa95384c0d40a Author: Cecilia Persson Date: 2016-06-22 (Wed, 22 Jun 2016) Changed paths: M src/docbkx/en/dhis2_user_man_data_elements.xml M src/docbkx/en/dhis2_user_man_orgunits.xml A src/docbkx/en/resources/images/maintainence/create_data_element.png R src/docbkx/en/resources/images/maintainence/data_element_main2.png A src/docbkx/en/resources/images/maintainence/obsolete_data_element_main2.png A src/docbkx/en/resources/images/orgunits/create_new_orgunit.png R src/docbkx/en/resources/images/orgunits/editing_orgunits_new.png A src/docbkx/en/resources/images/orgunits/editing_orgunits_new_old.png Log Message: --- Man app: Further edits to data elements and org units Screenshots updated. Commit: e7ec1b65d99a678cafe1a02a45897c7193a0ff91 https://github.com/dhis2/dhis2-docs/commit/e7ec1b65d99a678cafe1a02a45897c7193a0ff91 Author: Cecilia Persson Date: 2016-06-22 (Wed, 22 Jun 2016) Changed paths: M src/docbkx/en/dhis2_user_man_data_elements.xml M src/docbkx/en/dhis2_user_man_datasets_forms.xml M src/docbkx/en/dhis2_user_man_orgunits.xml A src/docbkx/en/resources/images/maintainence/create_data_element.png R src/docbkx/en/resources/images/maintainence/data_element_main2.png A src/docbkx/en/resources/images/maintainence/obsolete_data_element_main2.png A src/docbkx/en/resources/images/orgunits/create_new_o
[Dhis2-documenters] [dhis2/dhis2-docs] 64532e: Merge branch 'master' into docinprogress
Branch: refs/heads/master Home: https://github.com/dhis2/dhis2-docs Commit: 64532e0b013c7b5cc3bb2d3fb36bce82adbf78fa https://github.com/dhis2/dhis2-docs/commit/64532e0b013c7b5cc3bb2d3fb36bce82adbf78fa Author: Cecilia Persson Date: 2016-06-20 (Mon, 20 Jun 2016) Changed paths: M .travis.yml Log Message: --- Merge branch 'master' into docinprogress Commit: c696cd59c0cffecff0861ecfa2f1084592f824ed https://github.com/dhis2/dhis2-docs/commit/c696cd59c0cffecff0861ecfa2f1084592f824ed Author: Jason P. Pickering Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M src/docbkx/en/dhis2_user_man_web_api.xml Log Message: --- Change query program messages API to a table. Commit: 9fbb4433b5270e60e530b7944fc2875f27538cb5 https://github.com/dhis2/dhis2-docs/commit/9fbb4433b5270e60e530b7944fc2875f27538cb5 Author: Jason P. Pickering Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M src/docbkx/en/dhis2_user_man_web_api.xml Log Message: --- Minor. Commit: bddc95ac14d4c6155d469f02de12110c7378d163 https://github.com/dhis2/dhis2-docs/commit/bddc95ac14d4c6155d469f02de12110c7378d163 Author: Cecilia Persson Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M src/docbkx/en/dhis2_documentation_guide.xml M src/docbkx/en/dhis2_user_man_data_elements.xml M src/docbkx/en/dhis2_user_man_orgunits.xml M src/docbkx/en/dhis2_user_man_web_api.xml Log Message: --- Merge remote-tracking branch 'origin/docinprogress' into docinprogress Commit: c2499248af8501164369452d645b53ddd1a3b75b https://github.com/dhis2/dhis2-docs/commit/c2499248af8501164369452d645b53ddd1a3b75b Author: Cecilia Persson Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: A src/docbkx/en/content/maintenance/mtn_batchgroupupdate.xml A src/docbkx/en/content/maintenance/mtn_toc.xml A src/docbkx/en/content/maintenance/test_book.xml R src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml R src/docbkx/en/resources/maintenance/mtn_toc.xml R src/docbkx/en/resources/maintenance/test_book.xml Log Message: --- Create new content folder and added Maintenance folder Commit: a42ad97344138fc3d686c8c5ee62cc606b283428 https://github.com/dhis2/dhis2-docs/commit/a42ad97344138fc3d686c8c5ee62cc606b283428 Author: Cecilia Persson Date: 2016-06-21 (Tue, 21 Jun 2016) Log Message: --- Merge branch 'master' into docinprogress Commit: c57ad798aa5c378b346b45081e3f254c85837af1 https://github.com/dhis2/dhis2-docs/commit/c57ad798aa5c378b346b45081e3f254c85837af1 Author: Cecilia Persson Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M src/docbkx/en/dhis2_user_man_datasets_forms.xml Log Message: --- Man app: Data sets - minor edits concept info Commit: 650731042ed000367889467231aee7be21e87302 https://github.com/dhis2/dhis2-docs/commit/650731042ed000367889467231aee7be21e87302 Author: Cecilia Persson Date: 2016-06-22 (Wed, 22 Jun 2016) Changed paths: M .travis.yml M .utility/deploy.sh M src/docbkx/en/dhis2_user_man_mobile_sms_command.xml M src/docbkx/en/dhis2_user_man_web_api.xml A src/docbkx/en/resources/images/dhis2_mobile_sms/event-registration-parser.png Log Message: --- Merge branch 'master' into docinprogress Commit: 401c006027df10942a74f4e5750fa95384c0d40a https://github.com/dhis2/dhis2-docs/commit/401c006027df10942a74f4e5750fa95384c0d40a Author: Cecilia Persson Date: 2016-06-22 (Wed, 22 Jun 2016) Changed paths: M src/docbkx/en/dhis2_user_man_data_elements.xml M src/docbkx/en/dhis2_user_man_orgunits.xml A src/docbkx/en/resources/images/maintainence/create_data_element.png R src/docbkx/en/resources/images/maintainence/data_element_main2.png A src/docbkx/en/resources/images/maintainence/obsolete_data_element_main2.png A src/docbkx/en/resources/images/orgunits/create_new_orgunit.png R src/docbkx/en/resources/images/orgunits/editing_orgunits_new.png A src/docbkx/en/resources/images/orgunits/editing_orgunits_new_old.png Log Message: --- Man app: Further edits to data elements and org units Screenshots updated. Commit: e7ec1b65d99a678cafe1a02a45897c7193a0ff91 https://github.com/dhis2/dhis2-docs/commit/e7ec1b65d99a678cafe1a02a45897c7193a0ff91 Author: Cecilia Persson Date: 2016-06-22 (Wed, 22 Jun 2016) Changed paths: M src/docbkx/en/dhis2_user_man_data_elements.xml M src/docbkx/en/dhis2_user_man_datasets_forms.xml M src/docbkx/en/dhis2_user_man_orgunits.xml A src/docbkx/en/resources/images/maintainence/create_data_element.png R src/docbkx/en/resources/images/maintainence/data_element_main2.png A src/docbkx/en/resources/images/maintainence/obsolete_data_element_main2.png A src/docbkx/en/resources/images/orgunits/create_new_orgu
