dhis2-documenters team mailing list archive
-
dhis2-documenters team
-
Mailing list archive
-
Message #01137
[dhis2/dhis2-docs] 23af74: Merge branch 'master' into docinprogress
Branch: refs/heads/use-cases
Home: https://github.com/dhis2/dhis2-docs
Commit: 23af745aa758b02f772cec6a7613dda3133a4317
https://github.com/dhis2/dhis2-docs/commit/23af745aa758b02f772cec6a7613dda3133a4317
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-09 (Mon, 09 May 2016)
Changed paths:
M src/docbkx/en/dhis2_implementation_guide_installation.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: 70ff0c4ebc131b0c48bab92b1db2dcfe9ad805d9
https://github.com/dhis2/dhis2-docs/commit/70ff0c4ebc131b0c48bab92b1db2dcfe9ad805d9
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-09 (Mon, 09 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_orgunits.xml
Log Message:
-----------
Mtn app: org units - first edits
Commit: 32fbe17c9541bc753afd0c92afa10fbc2c8d3e0b
https://github.com/dhis2/dhis2-docs/commit/32fbe17c9541bc753afd0c92afa10fbc2c8d3e0b
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-10 (Tue, 10 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
Log Message:
-----------
Mtn app: Edit and restructured Data elements
Commit: 150a511fddc0a7a88bc3249c9e0a815c2c389516
https://github.com/dhis2/dhis2-docs/commit/150a511fddc0a7a88bc3249c9e0a815c2c389516
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-10 (Tue, 10 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: 1449fb0a995c1b4d148726873469c8f5c939cd9d
https://github.com/dhis2/dhis2-docs/commit/1449fb0a995c1b4d148726873469c8f5c939cd9d
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-12 (Thu, 12 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
Log Message:
-----------
Data elements: more edits and restructure
Commit: dc8388576be86ea513089224c9340fdd9ff17600
https://github.com/dhis2/dhis2-docs/commit/dc8388576be86ea513089224c9340fdd9ff17600
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-12 (Thu, 12 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_apps.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: 993258758d7cd33a86cfad1fd97008dc2df028fb
https://github.com/dhis2/dhis2-docs/commit/993258758d7cd33a86cfad1fd97008dc2df028fb
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-12 (Thu, 12 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
Log Message:
-----------
Mtn app, Data elements: More edits and restructure
Commit: 0faac921f6d34382b0ebd749857b9dc94a745e40
https://github.com/dhis2/dhis2-docs/commit/0faac921f6d34382b0ebd749857b9dc94a745e40
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-13 (Fri, 13 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
Log Message:
-----------
Mtn app: Data elements - more edits and restructure
Commit: 6b3fd0430b076062a5ff3662cc3ac2652ea84387
https://github.com/dhis2/dhis2-docs/commit/6b3fd0430b076062a5ff3662cc3ac2652ea84387
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-13 (Fri, 13 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: f2f1c3b0c479e6600943986f2684c1a9f6be2dcc
https://github.com/dhis2/dhis2-docs/commit/f2f1c3b0c479e6600943986f2684c1a9f6be2dcc
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-13 (Fri, 13 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
Log Message:
-----------
Mtn app: Org units - further edits and restructure, Data elements - minor edits
Commit: 51ae883110acec911a55dafa00ab35b81d7a3dbf
https://github.com/dhis2/dhis2-docs/commit/51ae883110acec911a55dafa00ab35b81d7a3dbf
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-18 (Wed, 18 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: ccc1774a72bdd807536c85e820c63542242eff9d
https://github.com/dhis2/dhis2-docs/commit/ccc1774a72bdd807536c85e820c63542242eff9d
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-18 (Wed, 18 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
Log Message:
-----------
Man app: Org units - major changes; Data elements - minor edits
Commit: b5878adae1ff03bb4553f955c34c4a2e64ab60c3
https://github.com/dhis2/dhis2-docs/commit/b5878adae1ff03bb4553f955c34c4a2e64ab60c3
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-19 (Thu, 19 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_indicators.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
Log Message:
-----------
Man app: Indicators - edits and restructure; Org units - smaller edits.
Commit: 23e23f2400e153c53cc7dc37d7d9d994ed3d3e0d
https://github.com/dhis2/dhis2-docs/commit/23e23f2400e153c53cc7dc37d7d9d994ed3d3e0d
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-20 (Fri, 20 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_indicators.xml
Log Message:
-----------
Mtn app: Indicators - edits and restructure
Commit: 2b762bc81773673ded5cec8d2c5bb8cf2df8fcd1
https://github.com/dhis2/dhis2-docs/commit/2b762bc81773673ded5cec8d2c5bb8cf2df8fcd1
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-23 (Mon, 23 May 2016)
Changed paths:
A src/docbkx/en/resources/xsl/glossary_to_po.xsl
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: e4261700dca11f0c52d325f6536e0d35ef3ee23b
https://github.com/dhis2/dhis2-docs/commit/e4261700dca11f0c52d325f6536e0d35ef3ee23b
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-23 (Mon, 23 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_indicators.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
Log Message:
-----------
Mtn app: Indicators - major edits, writing and restructure; Data elements - minor edits; Org units - minor edits
Commit: 9ecba217c47c91b007a6074b4f8dd8fe27559c4c
https://github.com/dhis2/dhis2-docs/commit/9ecba217c47c91b007a6074b4f8dd8fe27559c4c
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-24 (Tue, 24 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_indicators.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
Log Message:
-----------
Mtn app: Org units - major rework and restructure; Indicators - minor edits
Commit: f92bc2a323f52de94b515f64d81b7f7f03df95c7
https://github.com/dhis2/dhis2-docs/commit/f92bc2a323f52de94b515f64d81b7f7f03df95c7
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-25 (Wed, 25 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
A src/docbkx/en/resources/images/dhis2_mobile_sms/gateway_configurations.png
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: f9926d9a8f067804cc74e0ca8f542e9d3e7c411b
https://github.com/dhis2/dhis2-docs/commit/f9926d9a8f067804cc74e0ca8f542e9d3e7c411b
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-25 (Wed, 25 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_orgunits.xml
Log Message:
-----------
Man app: Org units- major rework
Commit: 0656b4e4c76cc224ab9d19fa6ba924eb280a8733
https://github.com/dhis2/dhis2-docs/commit/0656b4e4c76cc224ab9d19fa6ba924eb280a8733
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_orgunits.xml
Log Message:
-----------
Mtn app: Org units- more edits and authoring
Commit: 1a8051f8333f252a2ac94f6aba38d7105aec5f32
https://github.com/dhis2/dhis2-docs/commit/1a8051f8333f252a2ac94f6aba38d7105aec5f32
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
A src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml
Log Message:
-----------
Man app: Metadata group editor topic created
Commit: 76fa879e2841529b4ee3d1c1e6f20e4d8cfe76c7
https://github.com/dhis2/dhis2-docs/commit/76fa879e2841529b4ee3d1c1e6f20e4d8cfe76c7
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-27 (Fri, 27 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_indicators.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
M src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml
Log Message:
-----------
Man app: Data elements, Indicators, Org units - more edits; Batch group update- topic created
Commit: 7a7f9606e4a456f041e392719c3b4c7af1a402a5
https://github.com/dhis2/dhis2-docs/commit/7a7f9606e4a456f041e392719c3b4c7af1a402a5
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-05-30 (Mon, 30 May 2016)
Changed paths:
M src/docbkx/en/dhis2_android_user_man_aggregate.xml
M src/docbkx/en/dhis2_database.xml
M src/docbkx/en/dhis2_database_schema.xml
M src/docbkx/en/dhis2_developer_manual.xml
M src/docbkx/en/dhis2_documentation_guide.xml
M src/docbkx/en/dhis2_documentation_guide_book.xml
M src/docbkx/en/dhis2_faq.xml
M src/docbkx/en/dhis2_implementation_guide_data_quality.xml
M src/docbkx/en/dhis2_implementation_guide_enduser_training.xml
M src/docbkx/en/dhis2_implementation_guide_indicators.xml
M src/docbkx/en/dhis2_implementation_guide_installation.xml
M src/docbkx/en/dhis2_implementation_guide_integration.xml
M src/docbkx/en/dhis2_preface.xml
M src/docbkx/en/dhis2_r.xml
M src/docbkx/en/dhis2_technical_architechture_guide.xml
M src/docbkx/en/dhis2_user_man_approving_data.xml
M src/docbkx/en/dhis2_user_man_apps.xml
M src/docbkx/en/dhis2_user_man_creating_data_quality.xml
M src/docbkx/en/dhis2_user_man_creating_gis.xml
M src/docbkx/en/dhis2_user_man_dashboard.xml
M src/docbkx/en/dhis2_user_man_data_administration.xml
M src/docbkx/en/dhis2_user_man_data_dimensions.xml
M src/docbkx/en/dhis2_user_man_datasets_forms.xml
M src/docbkx/en/dhis2_user_man_getting_started.xml
M src/docbkx/en/dhis2_user_man_getting_started_enduser.xml
M src/docbkx/en/dhis2_user_man_getting_started_enduser_ke.xml
M src/docbkx/en/dhis2_user_man_import_export.xml
M src/docbkx/en/dhis2_user_man_introduction.xml
M src/docbkx/en/dhis2_user_man_mobile_J2ME_GPRS_3G.xml
M src/docbkx/en/dhis2_user_man_mobile_web_based.xml
M src/docbkx/en/dhis2_user_man_profile.xml
M src/docbkx/en/dhis2_user_man_settings.xml
M src/docbkx/en/dhis2_user_man_sharing.xml
M src/docbkx/en/dhis2_user_man_tracker.xml
M src/docbkx/en/dhis2_user_man_user_management.xml
M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml
M src/docbkx/en/dhis2_user_man_using_gis.xml
M src/docbkx/en/dhis2_user_man_using_pivot_table.xml
M src/docbkx/en/dhis2_user_man_using_reporting.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
M src/docbkx/en/glossary_en.xml
M src/docbkx/en/resources/bookinfo/authorgroup.xml
M src/docbkx/en/resources/bookinfo/bookinfo.xml
M src/docbkx/en/resources/bookinfo/copyright.xml
M src/docbkx/en/resources/bookinfo/keywordset.xml
M src/docbkx/en/resources/xsl/fop-cust.xsl
M src/docbkx/es/dhis2_documentation_guide_book_es.xml
M src/docbkx/es/dhis2_documentation_guide_es.xml
M src/docbkx/es/dhis2_implementation_guide_data_analysis_tools_overview.xml
M src/docbkx/es/dhis2_implementation_guide_data_elements_and_custom_dimensions.xml
M src/docbkx/es/dhis2_implementation_guide_data_quality.xml
M src/docbkx/es/dhis2_implementation_guide_deployment_strategies.xml
M src/docbkx/es/dhis2_implementation_guide_enduser_training.xml
M src/docbkx/es/dhis2_implementation_guide_es.xml
M src/docbkx/es/dhis2_implementation_guide_indicators.xml
M src/docbkx/es/dhis2_implementation_guide_installation.xml
M src/docbkx/es/dhis2_implementation_guide_integration.xml
M src/docbkx/es/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml
M src/docbkx/es/dhis2_implementation_guide_recommendations.xml
M src/docbkx/es/dhis2_implementation_guide_setting_up_new_database.xml
M src/docbkx/es/dhis2_implementation_guide_short.xml
M src/docbkx/es/dhis2_localization_guide.xml
M src/docbkx/es/dhis2_preface.xml
M src/docbkx/es/dhis2_user_man_creating_data_quality.xml
M src/docbkx/es/dhis2_user_man_creating_gis.xml
M src/docbkx/es/dhis2_user_man_creating_reporting.xml
M src/docbkx/es/dhis2_user_man_dashboard.xml
M src/docbkx/es/dhis2_user_man_data_administration.xml
M src/docbkx/es/dhis2_user_man_data_dimensions.xml
M src/docbkx/es/dhis2_user_man_data_elements.xml
M src/docbkx/es/dhis2_user_man_datasets_forms.xml
M src/docbkx/es/dhis2_user_man_getting_started.xml
M src/docbkx/es/dhis2_user_man_getting_started_enduser.xml
M src/docbkx/es/dhis2_user_man_getting_started_enduser_ke.xml
M src/docbkx/es/dhis2_user_man_import_export.xml
M src/docbkx/es/dhis2_user_man_indicators.xml
M src/docbkx/es/dhis2_user_man_integration.xml
M src/docbkx/es/dhis2_user_man_introduction.xml
M src/docbkx/es/dhis2_user_man_mobile.xml
M src/docbkx/es/dhis2_user_man_mobile_J2ME_GPRS_3G.xml
M src/docbkx/es/dhis2_user_man_mobile_J2ME_sms_transport.xml
M src/docbkx/es/dhis2_user_man_mobile_web_based.xml
M src/docbkx/es/dhis2_user_man_orgunits.xml
M src/docbkx/es/dhis2_user_man_persons_and_programs.xml
M src/docbkx/es/dhis2_user_man_user_management.xml
M src/docbkx/es/dhis2_user_man_using_data_visualizer.xml
M src/docbkx/es/dhis2_user_man_using_gis.xml
M src/docbkx/es/dhis2_user_man_using_reporting.xml
M src/docbkx/es/dhis2_user_man_web_api.xml
M src/docbkx/es/dhis2_user_manual_es.xml
M src/docbkx/es/glossary_es.xml
M src/docbkx/es/resources/bookinfo/authorgroup.xml
M src/docbkx/es/resources/bookinfo/keywordset.xml
M src/docbkx/es/resources/xsl/fop-cust.xsl
M src/docbkx/fr/dhis2_documentation_guide.xml
M src/docbkx/fr/dhis2_documentation_guide_book.xml
M src/docbkx/fr/dhis2_implementation_guide.xml
M src/docbkx/fr/dhis2_implementation_guide_as_a_platform.xml
M src/docbkx/fr/dhis2_implementation_guide_conceptual_design_principles.xml
M src/docbkx/fr/dhis2_implementation_guide_data_quality.xml
M src/docbkx/fr/dhis2_implementation_guide_enduser_training.xml
M src/docbkx/fr/dhis2_implementation_guide_indicators.xml
M src/docbkx/fr/dhis2_implementation_guide_installation.xml
M src/docbkx/fr/dhis2_implementation_guide_integration.xml
M src/docbkx/fr/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml
M src/docbkx/fr/dhis2_implementation_guide_short.xml
M src/docbkx/fr/dhis2_implementation_guide_support.xml
M src/docbkx/fr/dhis2_preface.xml
M src/docbkx/fr/dhis2_user_man_dashboard.xml
M src/docbkx/fr/dhis2_user_man_data_elements.xml
M src/docbkx/fr/dhis2_user_man_data_elements_and_indicators.xml
M src/docbkx/fr/dhis2_user_man_excel_reports.xml
M src/docbkx/fr/dhis2_user_man_getting_started.xml
M src/docbkx/fr/dhis2_user_man_gis.xml
M src/docbkx/fr/dhis2_user_man_introduction.xml
M src/docbkx/fr/dhis2_user_man_orgunits.xml
M src/docbkx/fr/dhis2_user_man_profile.xml
M src/docbkx/fr/dhis2_user_man_reporting.xml
M src/docbkx/fr/dhis2_user_man_using_gis.xml
M src/docbkx/fr/dhis2_user_man_using_reporting.xml
M src/docbkx/fr/dhis2_using_mydatamart_en.xml
M src/docbkx/fr/glossary.xml
M src/docbkx/fr/resources/bookinfo/authorgroup.xml
M src/docbkx/fr/resources/bookinfo/keywordset.xml
M src/docbkx/fr/resources/xsl/fop-cust.xsl
M src/docbkx/fr/resources/xsl/fop-cust_ng.xsl
M src/docbkx/fr/resources/xsl/fop-cust_zm.xsl
M src/docbkx/pt/POSSIBLE_DUPLICATE_dhis2_user_man_indicators_intro.xml
M src/docbkx/pt/dhis2_implementation_guide_data_quality.xml
M src/docbkx/pt/dhis2_implementation_guide_indicators.xml
M src/docbkx/pt/dhis2_implementation_guide_installation.xml
M src/docbkx/pt/dhis2_implementation_guide_integration.xml
M src/docbkx/pt/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml
M src/docbkx/pt/dhis2_implementation_guide_pt.xml
M src/docbkx/pt/dhis2_implementation_guide_short.xml
M src/docbkx/pt/dhis2_user_man_creating_data_quality.xml
M src/docbkx/pt/dhis2_user_man_creating_gis.xml
M src/docbkx/pt/dhis2_user_man_creating_reporting.xml
M src/docbkx/pt/dhis2_user_man_dashboard.xml
M src/docbkx/pt/dhis2_user_man_data_administration.xml
M src/docbkx/pt/dhis2_user_man_data_elements.xml
M src/docbkx/pt/dhis2_user_man_datasets_forms.xml
M src/docbkx/pt/dhis2_user_man_getting_started.xml
M src/docbkx/pt/dhis2_user_man_indicators.xml
M src/docbkx/pt/dhis2_user_man_introduction.xml
M src/docbkx/pt/dhis2_user_man_mobile.xml
M src/docbkx/pt/dhis2_user_man_orgunits.xml
M src/docbkx/pt/dhis2_user_man_persons_and_programs.xml
M src/docbkx/pt/dhis2_user_man_user_management.xml
M src/docbkx/pt/dhis2_user_man_using_gis.xml
M src/docbkx/pt/dhis2_using_mydatamart_en.xml
M src/docbkx/pt/help_content_pt.xml
M src/docbkx/pt/resources/bookinfo/authorgroup.xml
M src/docbkx/pt/resources/bookinfo/keywordset.xml
M src/docbkx/pt/resources/xsl/fop-cust.xsl
Log Message:
-----------
Consitent use of DHIS 2 instead of DHIS2.
Commit: 0c5377a53ac9a1cdc6845f190b999f667e6701a0
https://github.com/dhis2/dhis2-docs/commit/0c5377a53ac9a1cdc6845f190b999f667e6701a0
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: 443cd113fea3d2468046ab2137f13afe06e15710
https://github.com/dhis2/dhis2-docs/commit/443cd113fea3d2468046ab2137f13afe06e15710
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' of github.com:dhis2/dhis2-docs into docinprogress
Commit: ae4e0ca12f3863188aba2a4d91734072beb7b27d
https://github.com/dhis2/dhis2-docs/commit/ae4e0ca12f3863188aba2a4d91734072beb7b27d
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' of github.com:dhis2/dhis2-docs
Commit: 5f16ac8b1d5fc664b6a62cefc4c5712f51d854c3
https://github.com/dhis2/dhis2-docs/commit/5f16ac8b1d5fc664b6a62cefc4c5712f51d854c3
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: ce8da2578ed3a5f7768986a44e542ee02ae79c6c
https://github.com/dhis2/dhis2-docs/commit/ce8da2578ed3a5f7768986a44e542ee02ae79c6c
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: 1d754652e2d4c9d56c6dc0f1d861e9d03793012c
https://github.com/dhis2/dhis2-docs/commit/1d754652e2d4c9d56c6dc0f1d861e9d03793012c
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: c30951b95ab1ad431d40ba65dd0e405b1d8f781a
https://github.com/dhis2/dhis2-docs/commit/c30951b95ab1ad431d40ba65dd0e405b1d8f781a
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml
Log Message:
-----------
Man app: metadata group editor - content created
Commit: 5f09db7656d7904131a6428c51278039acb96642
https://github.com/dhis2/dhis2-docs/commit/5f09db7656d7904131a6428c51278039acb96642
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_android_user_man_aggregate.xml
M src/docbkx/en/dhis2_database.xml
M src/docbkx/en/dhis2_database_schema.xml
M src/docbkx/en/dhis2_developer_manual.xml
M src/docbkx/en/dhis2_documentation_guide.xml
M src/docbkx/en/dhis2_documentation_guide_book.xml
M src/docbkx/en/dhis2_faq.xml
M src/docbkx/en/dhis2_implementation_guide_data_quality.xml
M src/docbkx/en/dhis2_implementation_guide_enduser_training.xml
M src/docbkx/en/dhis2_implementation_guide_indicators.xml
M src/docbkx/en/dhis2_implementation_guide_installation.xml
M src/docbkx/en/dhis2_implementation_guide_integration.xml
M src/docbkx/en/dhis2_preface.xml
M src/docbkx/en/dhis2_r.xml
M src/docbkx/en/dhis2_technical_architechture_guide.xml
M src/docbkx/en/dhis2_user_man_approving_data.xml
M src/docbkx/en/dhis2_user_man_apps.xml
M src/docbkx/en/dhis2_user_man_creating_data_quality.xml
M src/docbkx/en/dhis2_user_man_creating_gis.xml
M src/docbkx/en/dhis2_user_man_dashboard.xml
M src/docbkx/en/dhis2_user_man_data_administration.xml
M src/docbkx/en/dhis2_user_man_data_dimensions.xml
M src/docbkx/en/dhis2_user_man_datasets_forms.xml
M src/docbkx/en/dhis2_user_man_getting_started.xml
M src/docbkx/en/dhis2_user_man_getting_started_enduser.xml
M src/docbkx/en/dhis2_user_man_getting_started_enduser_ke.xml
M src/docbkx/en/dhis2_user_man_import_export.xml
M src/docbkx/en/dhis2_user_man_introduction.xml
M src/docbkx/en/dhis2_user_man_mobile_J2ME_GPRS_3G.xml
M src/docbkx/en/dhis2_user_man_mobile_web_based.xml
M src/docbkx/en/dhis2_user_man_profile.xml
M src/docbkx/en/dhis2_user_man_settings.xml
M src/docbkx/en/dhis2_user_man_sharing.xml
M src/docbkx/en/dhis2_user_man_tracker.xml
M src/docbkx/en/dhis2_user_man_user_management.xml
M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml
M src/docbkx/en/dhis2_user_man_using_gis.xml
M src/docbkx/en/dhis2_user_man_using_pivot_table.xml
M src/docbkx/en/dhis2_user_man_using_reporting.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
M src/docbkx/en/glossary_en.xml
M src/docbkx/en/resources/bookinfo/authorgroup.xml
M src/docbkx/en/resources/bookinfo/bookinfo.xml
M src/docbkx/en/resources/bookinfo/copyright.xml
M src/docbkx/en/resources/bookinfo/keywordset.xml
M src/docbkx/en/resources/xsl/fop-cust.xsl
M src/docbkx/es/dhis2_documentation_guide_book_es.xml
M src/docbkx/es/dhis2_documentation_guide_es.xml
M src/docbkx/es/dhis2_implementation_guide_data_analysis_tools_overview.xml
M src/docbkx/es/dhis2_implementation_guide_data_elements_and_custom_dimensions.xml
M src/docbkx/es/dhis2_implementation_guide_data_quality.xml
M src/docbkx/es/dhis2_implementation_guide_deployment_strategies.xml
M src/docbkx/es/dhis2_implementation_guide_enduser_training.xml
M src/docbkx/es/dhis2_implementation_guide_es.xml
M src/docbkx/es/dhis2_implementation_guide_indicators.xml
M src/docbkx/es/dhis2_implementation_guide_installation.xml
M src/docbkx/es/dhis2_implementation_guide_integration.xml
M src/docbkx/es/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml
M src/docbkx/es/dhis2_implementation_guide_recommendations.xml
M src/docbkx/es/dhis2_implementation_guide_setting_up_new_database.xml
M src/docbkx/es/dhis2_implementation_guide_short.xml
M src/docbkx/es/dhis2_localization_guide.xml
M src/docbkx/es/dhis2_preface.xml
M src/docbkx/es/dhis2_user_man_creating_data_quality.xml
M src/docbkx/es/dhis2_user_man_creating_gis.xml
M src/docbkx/es/dhis2_user_man_creating_reporting.xml
M src/docbkx/es/dhis2_user_man_dashboard.xml
M src/docbkx/es/dhis2_user_man_data_administration.xml
M src/docbkx/es/dhis2_user_man_data_dimensions.xml
M src/docbkx/es/dhis2_user_man_data_elements.xml
M src/docbkx/es/dhis2_user_man_datasets_forms.xml
M src/docbkx/es/dhis2_user_man_getting_started.xml
M src/docbkx/es/dhis2_user_man_getting_started_enduser.xml
M src/docbkx/es/dhis2_user_man_getting_started_enduser_ke.xml
M src/docbkx/es/dhis2_user_man_import_export.xml
M src/docbkx/es/dhis2_user_man_indicators.xml
M src/docbkx/es/dhis2_user_man_integration.xml
M src/docbkx/es/dhis2_user_man_introduction.xml
M src/docbkx/es/dhis2_user_man_mobile.xml
M src/docbkx/es/dhis2_user_man_mobile_J2ME_GPRS_3G.xml
M src/docbkx/es/dhis2_user_man_mobile_J2ME_sms_transport.xml
M src/docbkx/es/dhis2_user_man_mobile_web_based.xml
M src/docbkx/es/dhis2_user_man_orgunits.xml
M src/docbkx/es/dhis2_user_man_persons_and_programs.xml
M src/docbkx/es/dhis2_user_man_user_management.xml
M src/docbkx/es/dhis2_user_man_using_data_visualizer.xml
M src/docbkx/es/dhis2_user_man_using_gis.xml
M src/docbkx/es/dhis2_user_man_using_reporting.xml
M src/docbkx/es/dhis2_user_man_web_api.xml
M src/docbkx/es/dhis2_user_manual_es.xml
M src/docbkx/es/glossary_es.xml
M src/docbkx/es/resources/bookinfo/authorgroup.xml
M src/docbkx/es/resources/bookinfo/keywordset.xml
M src/docbkx/es/resources/xsl/fop-cust.xsl
M src/docbkx/fr/dhis2_documentation_guide.xml
M src/docbkx/fr/dhis2_documentation_guide_book.xml
M src/docbkx/fr/dhis2_implementation_guide.xml
M src/docbkx/fr/dhis2_implementation_guide_as_a_platform.xml
M src/docbkx/fr/dhis2_implementation_guide_conceptual_design_principles.xml
M src/docbkx/fr/dhis2_implementation_guide_data_quality.xml
M src/docbkx/fr/dhis2_implementation_guide_enduser_training.xml
M src/docbkx/fr/dhis2_implementation_guide_indicators.xml
M src/docbkx/fr/dhis2_implementation_guide_installation.xml
M src/docbkx/fr/dhis2_implementation_guide_integration.xml
M src/docbkx/fr/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml
M src/docbkx/fr/dhis2_implementation_guide_short.xml
M src/docbkx/fr/dhis2_implementation_guide_support.xml
M src/docbkx/fr/dhis2_preface.xml
M src/docbkx/fr/dhis2_user_man_dashboard.xml
M src/docbkx/fr/dhis2_user_man_data_elements.xml
M src/docbkx/fr/dhis2_user_man_data_elements_and_indicators.xml
M src/docbkx/fr/dhis2_user_man_excel_reports.xml
M src/docbkx/fr/dhis2_user_man_getting_started.xml
M src/docbkx/fr/dhis2_user_man_gis.xml
M src/docbkx/fr/dhis2_user_man_introduction.xml
M src/docbkx/fr/dhis2_user_man_orgunits.xml
M src/docbkx/fr/dhis2_user_man_profile.xml
M src/docbkx/fr/dhis2_user_man_reporting.xml
M src/docbkx/fr/dhis2_user_man_using_gis.xml
M src/docbkx/fr/dhis2_user_man_using_reporting.xml
M src/docbkx/fr/dhis2_using_mydatamart_en.xml
M src/docbkx/fr/glossary.xml
M src/docbkx/fr/resources/bookinfo/authorgroup.xml
M src/docbkx/fr/resources/bookinfo/keywordset.xml
M src/docbkx/fr/resources/xsl/fop-cust.xsl
M src/docbkx/fr/resources/xsl/fop-cust_ng.xsl
M src/docbkx/fr/resources/xsl/fop-cust_zm.xsl
M src/docbkx/pt/POSSIBLE_DUPLICATE_dhis2_user_man_indicators_intro.xml
M src/docbkx/pt/dhis2_implementation_guide_data_quality.xml
M src/docbkx/pt/dhis2_implementation_guide_indicators.xml
M src/docbkx/pt/dhis2_implementation_guide_installation.xml
M src/docbkx/pt/dhis2_implementation_guide_integration.xml
M src/docbkx/pt/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml
M src/docbkx/pt/dhis2_implementation_guide_pt.xml
M src/docbkx/pt/dhis2_implementation_guide_short.xml
M src/docbkx/pt/dhis2_user_man_creating_data_quality.xml
M src/docbkx/pt/dhis2_user_man_creating_gis.xml
M src/docbkx/pt/dhis2_user_man_creating_reporting.xml
M src/docbkx/pt/dhis2_user_man_dashboard.xml
M src/docbkx/pt/dhis2_user_man_data_administration.xml
M src/docbkx/pt/dhis2_user_man_data_elements.xml
M src/docbkx/pt/dhis2_user_man_datasets_forms.xml
M src/docbkx/pt/dhis2_user_man_getting_started.xml
M src/docbkx/pt/dhis2_user_man_indicators.xml
M src/docbkx/pt/dhis2_user_man_introduction.xml
M src/docbkx/pt/dhis2_user_man_mobile.xml
M src/docbkx/pt/dhis2_user_man_orgunits.xml
M src/docbkx/pt/dhis2_user_man_persons_and_programs.xml
M src/docbkx/pt/dhis2_user_man_user_management.xml
M src/docbkx/pt/dhis2_user_man_using_gis.xml
M src/docbkx/pt/dhis2_using_mydatamart_en.xml
M src/docbkx/pt/help_content_pt.xml
M src/docbkx/pt/resources/bookinfo/authorgroup.xml
M src/docbkx/pt/resources/bookinfo/keywordset.xml
M src/docbkx/pt/resources/xsl/fop-cust.xsl
Log Message:
-----------
Merge remote-tracking branch 'origin/docinprogress' into docinprogress
Commit: ecc79083aad3f943f85f626af9fcfb1d53694d05
https://github.com/dhis2/dhis2-docs/commit/ecc79083aad3f943f85f626af9fcfb1d53694d05
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_datasets_forms.xml
M src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml
Log Message:
-----------
Man app: Metadata group editor - first version complete; Data sets - edits and restructure
Commit: c7d2d94d7f862de77fdea2bd5c54fae5c9ad1291
https://github.com/dhis2/dhis2-docs/commit/c7d2d94d7f862de77fdea2bd5c54fae5c9ad1291
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_datasets_forms.xml
M src/docbkx/en/dhis2_user_man_indicators.xml
A src/docbkx/en/resources/maintenance/mtn_toc.xml
A src/docbkx/en/resources/template/topic_template.xml
Log Message:
-----------
Man app: Indicators - minor edits; Data sets - major restructure and content creation
Created topic template
Started to create Mtn app TOC
Commit: e0d67b10c2ffc0f1d0137b860b18b99ee2429d25
https://github.com/dhis2/dhis2-docs/commit/e0d67b10c2ffc0f1d0137b860b18b99ee2429d25
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: 5e90bdb213ae7cafb3910f53741cd008dd5650b1
https://github.com/dhis2/dhis2-docs/commit/5e90bdb213ae7cafb3910f53741cd008dd5650b1
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-06 (Mon, 06 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_datasets_forms.xml
Log Message:
-----------
Man app: Datasets- major rework
Commit: d7afb6c0d2aa12f2341396374ad7c17c2c7e5510
https://github.com/dhis2/dhis2-docs/commit/d7afb6c0d2aa12f2341396374ad7c17c2c7e5510
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-07 (Tue, 07 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_documentation_guide.xml
Log Message:
-----------
Slight touchup on the documentation documentation.
Commit: 453e38f6c15a11284549b1de9fd76f1d5f38ae64
https://github.com/dhis2/dhis2-docs/commit/453e38f6c15a11284549b1de9fd76f1d5f38ae64
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-07 (Tue, 07 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' of github.com:dhis2/dhis2-docs
Commit: 07f6217927f532bdf98c7a594701de622ced03d6
https://github.com/dhis2/dhis2-docs/commit/07f6217927f532bdf98c7a594701de622ced03d6
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-09 (Thu, 09 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/resources/maintenance/mtn_toc.xml
A src/docbkx/en/resources/maintenance/test_book.xml
Log Message:
-----------
Mtn app: Misc edits; Link testing
Commit: 3499ef047b3b45b7d7a672604f12dda33f1e0946
https://github.com/dhis2/dhis2-docs/commit/3499ef047b3b45b7d7a672604f12dda33f1e0946
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: 227ee6ad79eba7bf796884fcd25f46079b8fe06f
https://github.com/dhis2/dhis2-docs/commit/227ee6ad79eba7bf796884fcd25f46079b8fe06f
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
A src/docbkx/en/dhis2_release_notes.xml
A src/docbkx/en/resources/images/icons/info.png
A src/docbkx/en/resources/images/icons/upgrade.png
Log Message:
-----------
Adding new chapter for release notes and upgrade notes.
Commit: 81d1e92eb2e25361ca4e5b9848f22654e750370c
https://github.com/dhis2/dhis2-docs/commit/81d1e92eb2e25361ca4e5b9848f22654e750370c
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' of github.com:dhis2/dhis2-docs
Commit: d7f5b49cd4642fb3841c65d849b816380e6c2af1
https://github.com/dhis2/dhis2-docs/commit/d7f5b49cd4642fb3841c65d849b816380e6c2af1
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
A src/docbkx/en/dhis2_release_notes.xml
A src/docbkx/en/resources/images/icons/info.png
A src/docbkx/en/resources/images/icons/upgrade.png
Log Message:
-----------
Adding new chapter for release notes and upgrade notes.
Commit: 0f048cd1916a7837e354e6bc30ccd70ee1f62590
https://github.com/dhis2/dhis2-docs/commit/0f048cd1916a7837e354e6bc30ccd70ee1f62590
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_datasets_forms.xml
Log Message:
-----------
Man app: Data sets and data forms - more edits
Commit: 738af7aa51c631f7b80a801efb57bb294eeb88a9
https://github.com/dhis2/dhis2-docs/commit/738af7aa51c631f7b80a801efb57bb294eeb88a9
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
A src/docbkx/en/dhis2_release_notes.xml
A src/docbkx/en/resources/images/icons/info.png
A src/docbkx/en/resources/images/icons/upgrade.png
Log Message:
-----------
Merge remote-tracking branch 'origin/docinprogress' into docinprogress
Commit: e59adcdc5895faa0a7274d0e88a22e4aace701ab
https://github.com/dhis2/dhis2-docs/commit/e59adcdc5895faa0a7274d0e88a22e4aace701ab
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: b90d6c8d1cfa576aa578a8a463e8abbee0ce1444
https://github.com/dhis2/dhis2-docs/commit/b90d6c8d1cfa576aa578a8a463e8abbee0ce1444
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_release_notes.xml
M src/docbkx/en/dhis2_user_manual_en.xml
Log Message:
-----------
Comment out 2.24 release notes for now. Enable release notes in main manual.
Commit: 4249f28f7a6b7f27cdf2e796521d40a205e62e0f
https://github.com/dhis2/dhis2-docs/commit/4249f28f7a6b7f27cdf2e796521d40a205e62e0f
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_release_notes.xml
M src/docbkx/en/dhis2_user_manual_en.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: beb303b56ff9af7513f37f9acc5fed908b7059ed
https://github.com/dhis2/dhis2-docs/commit/beb303b56ff9af7513f37f9acc5fed908b7059ed
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-14 (Tue, 14 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_indicators.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
Log Message:
-----------
Mtn: misc edits
Commit: a72cd243c17997512ab3ab4c9e23422ebf5ed319
https://github.com/dhis2/dhis2-docs/commit/a72cd243c17997512ab3ab4c9e23422ebf5ed319
Author: zubaira <zubair@xxxxxxxxx>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Program Message docs modified
Commit: a6f53cb14c5d5236b2333b47ab797e107fd0ca07
https://github.com/dhis2/dhis2-docs/commit/a6f53cb14c5d5236b2333b47ab797e107fd0ca07
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: 8c024d0ba22edd6012ecd6625e66ff1c52f7afc8
https://github.com/dhis2/dhis2-docs/commit/8c024d0ba22edd6012ecd6625e66ff1c52f7afc8
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_datasets_forms.xml
Log Message:
-----------
Mtn app: more edits
Commit: 6bc9fc74e68a20a920553e37bcd056c11af9c01a
https://github.com/dhis2/dhis2-docs/commit/6bc9fc74e68a20a920553e37bcd056c11af9c01a
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_datasets_forms.xml
Log Message:
-----------
Custom forms, js functions
Commit: ec9fd097db0e6d146ef9d1e23f8a145f2e73d3a9
https://github.com/dhis2/dhis2-docs/commit/ec9fd097db0e6d146ef9d1e23f8a145f2e73d3a9
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
A src/docbkx/en/dhis2_release_notes.xml
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_indicators.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
M src/docbkx/en/dhis2_user_manual_en.xml
A src/docbkx/en/resources/images/icons/info.png
A src/docbkx/en/resources/images/icons/upgrade.png
A src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml
Log Message:
-----------
Merge branch 'master' of github.com:dhis2/dhis2-docs
Commit: 853cfe99203161217fc44cdedaf507fab3f937a3
https://github.com/dhis2/dhis2-docs/commit/853cfe99203161217fc44cdedaf507fab3f937a3
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
R src/docbkx/en/dhis2_release_notes.xml
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_indicators.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
M src/docbkx/en/dhis2_user_manual_en.xml
R src/docbkx/en/resources/images/icons/info.png
R src/docbkx/en/resources/images/icons/upgrade.png
R src/docbkx/en/resources/maintenance/mtn_batchgroupupdate.xml
Log Message:
-----------
Revert "Merge branch 'master' of github.com:dhis2/dhis2-docs"
This reverts commit ec9fd097db0e6d146ef9d1e23f8a145f2e73d3a9, reversing
changes made to 6bc9fc74e68a20a920553e37bcd056c11af9c01a.
Reverting merge ec9fd097db0e6d146ef9d1e23f8a145f2e73d3a9
Commit: b320ea02f81062fcfc9a85cef5c003482ffc944b
https://github.com/dhis2/dhis2-docs/commit/b320ea02f81062fcfc9a85cef5c003482ffc944b
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_datasets_forms.xml
Log Message:
-----------
Functions
Commit: 679575beef75514fd682eca150d889814eb95a33
https://github.com/dhis2/dhis2-docs/commit/679575beef75514fd682eca150d889814eb95a33
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_datasets_forms.xml
Log Message:
-----------
Functions
Commit: 1679d083b833546ae96da73ae1332bab049db396
https://github.com/dhis2/dhis2-docs/commit/1679d083b833546ae96da73ae1332bab049db396
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_creating_gis.xml
Log Message:
-----------
Updating MapShaper link. Fixes #40.
Commit: 89b99264e84da5e1ba342eaf2fa692b282ae903a
https://github.com/dhis2/dhis2-docs/commit/89b99264e84da5e1ba342eaf2fa692b282ae903a
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
A src/docbkx/en/dhis2_release_notes.xml
A src/docbkx/en/resources/images/icons/info.png
A src/docbkx/en/resources/images/icons/upgrade.png
Log Message:
-----------
Adding new chapter for release notes and upgrade notes.
Commit: 47865b75c3d3c1a11f6dc5e4918de104fbb67a39
https://github.com/dhis2/dhis2-docs/commit/47865b75c3d3c1a11f6dc5e4918de104fbb67a39
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_release_notes.xml
M src/docbkx/en/dhis2_user_manual_en.xml
Log Message:
-----------
Comment out 2.24 release notes for now. Enable release notes in main manual.
Commit: a1360de7a6f2e32cec7338b7fbc9a50470370d1f
https://github.com/dhis2/dhis2-docs/commit/a1360de7a6f2e32cec7338b7fbc9a50470370d1f
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Adding quote to make JSON palyoad valid.
Commit: d858f7f0f3b74197f112558be80a8a6682499968
https://github.com/dhis2/dhis2-docs/commit/d858f7f0f3b74197f112558be80a8a6682499968
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Fix the fix.
Commit: d214ef2e0cf1395c5ba8b8dd71061e08f064420d
https://github.com/dhis2/dhis2-docs/commit/d214ef2e0cf1395c5ba8b8dd71061e08f064420d
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_creating_gis.xml
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_indicators.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merging with master. May need edits.
Commit: 3d5fc681ddfc2fa61db57ffb86b019c98c22172d
https://github.com/dhis2/dhis2-docs/commit/3d5fc681ddfc2fa61db57ffb86b019c98c22172d
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M .travis.yml
Log Message:
-----------
Update to travis file.
Commit: b1b201817bf08538615a55a1c657bdb299e0f7db
https://github.com/dhis2/dhis2-docs/commit/b1b201817bf08538615a55a1c657bdb299e0f7db
Author: Jason Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_documentation_guide.xml
Log Message:
-----------
Updating documentation doc. (#41)
Commit: 64532e0b013c7b5cc3bb2d3fb36bce82adbf78fa
https://github.com/dhis2/dhis2-docs/commit/64532e0b013c7b5cc3bb2d3fb36bce82adbf78fa
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M .travis.yml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: a61824edb009e334921ca783c8187d9a09041d9e
https://github.com/dhis2/dhis2-docs/commit/a61824edb009e334921ca783c8187d9a09041d9e
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-21 (Tue, 21 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_data_elements.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
Log Message:
-----------
Adding back in reverted files.
Commit: 5597dee4d2834d93e9050c107a0aded18565e024
https://github.com/dhis2/dhis2-docs/commit/5597dee4d2834d93e9050c107a0aded18565e024
Author: zubaira <zubair@xxxxxxxxx>
Date: 2016-06-21 (Tue, 21 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Adding back a72cd243c17997512ab3ab4c9e23422ebf5ed319
Commit: c696cd59c0cffecff0861ecfa2f1084592f824ed
https://github.com/dhis2/dhis2-docs/commit/c696cd59c0cffecff0861ecfa2f1084592f824ed
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
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: cca5907eb81f193a1b9a3ff674389002c44dd9f9
https://github.com/dhis2/dhis2-docs/commit/cca5907eb81f193a1b9a3ff674389002c44dd9f9
Author: Stian Sandvold <stian@xxxxxxxxx>
Date: 2016-06-21 (Tue, 21 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Added info about changing priority and status of tickets
Commit: 9fbb4433b5270e60e530b7944fc2875f27538cb5
https://github.com/dhis2/dhis2-docs/commit/9fbb4433b5270e60e530b7944fc2875f27538cb5
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
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 <cecilia@xxxxxxxxx>
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 <cecilia@xxxxxxxxx>
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: f87ae82cc0efa1818c833e32bc8219fd0ee0d56d
https://github.com/dhis2/dhis2-docs/commit/f87ae82cc0efa1818c833e32bc8219fd0ee0d56d
Author: Stian Sandvold <stian@xxxxxxxxx>
Date: 2016-06-21 (Tue, 21 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_dashboard.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
More information about ticketing
Commit: dc822efa9132bdd8803af7be17d882a47f8d5be9
https://github.com/dhis2/dhis2-docs/commit/dc822efa9132bdd8803af7be17d882a47f8d5be9
Author: Jason Pickering <jason.p.pickering@xxxxxxxxx>
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
M src/docbkx/en/dhis2_user_man_web_api.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:
-----------
Changes to program query API docs (#43)
* Change query program messages API to a table.
* Minor.
* Create new content folder and added Maintenance folder
Commit: a42ad97344138fc3d686c8c5ee62cc606b283428
https://github.com/dhis2/dhis2-docs/commit/a42ad97344138fc3d686c8c5ee62cc606b283428
Author: Cecilia Persson <cecilia@xxxxxxxxx>
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 <cecilia@xxxxxxxxx>
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: 176cf0202745487e198ab2d9d0dbb9f9ccc23d2f
https://github.com/dhis2/dhis2-docs/commit/176cf0202745487e198ab2d9d0dbb9f9ccc23d2f
Author: Jason Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-21 (Tue, 21 Jun 2016)
Changed paths:
M .travis.yml
M .utility/deploy.sh
Log Message:
-----------
Try and shut Travis up. (#48)
Commit: 8ea8e4e7ee4646a3459767314db1f58c46b2f023
https://github.com/dhis2/dhis2-docs/commit/8ea8e4e7ee4646a3459767314db1f58c46b2f023
Author: zubaira <zubair@xxxxxxxxx>
Date: 2016-06-21 (Tue, 21 Jun 2016)
Changed paths:
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:
-----------
Sms docs (#46)
* Event Registration Parser docs
* Event Registration Parser docs
* API docs for SMSCommand
* API docs for SMSCommands
Commit: ae823f5fd5a4644a3127a3b818bae2f257e0a5b1
https://github.com/dhis2/dhis2-docs/commit/ae823f5fd5a4644a3127a3b818bae2f257e0a5b1
Author: rachbrooke <rachael@xxxxxxxxx>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_dashboard.xml
Log Message:
-----------
Update dhis2_user_man_dashboard.xml
Slightly modified the description in places.
Commit: 650731042ed000367889467231aee7be21e87302
https://github.com/dhis2/dhis2-docs/commit/650731042ed000367889467231aee7be21e87302
Author: Cecilia Persson <cecilia@xxxxxxxxx>
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: 137d0354c7160ddda551e09709591e4d38ff083c
https://github.com/dhis2/dhis2-docs/commit/137d0354c7160ddda551e09709591e4d38ff083c
Author: rachbrooke <rachael@xxxxxxxxx>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Update dhis2_user_man_web_api.xml
Added some minor changes to the description.
Commit: d2980558aa7c18c2893edeb99b4f369c02599750
https://github.com/dhis2/dhis2-docs/commit/d2980558aa7c18c2893edeb99b4f369c02599750
Author: Jason Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M .travis.yml
M .utility/deploy.sh
Log Message:
-----------
Try and shut Travis up. (#48)
Commit: f50fd0e149163f9cbcaa925734323de3ef54c2cd
https://github.com/dhis2/dhis2-docs/commit/f50fd0e149163f9cbcaa925734323de3ef54c2cd
Author: Jason Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-06-22 (Wed, 22 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
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
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:
-----------
Merge branch 'master' into ticketing
Commit: 401c006027df10942a74f4e5750fa95384c0d40a
https://github.com/dhis2/dhis2-docs/commit/401c006027df10942a74f4e5750fa95384c0d40a
Author: Cecilia Persson <cecilia@xxxxxxxxx>
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 <cecilia@xxxxxxxxx>
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_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:
-----------
Merge pull request #50 from dhis2/docinprogress
Commit latest updates of docinprogress to master
Commit: 943efd44016f048e90679c5ad47ef1dd34688336
https://github.com/dhis2/dhis2-docs/commit/943efd44016f048e90679c5ad47ef1dd34688336
Author: Cecilia Persson <cecilia@xxxxxxxxx>
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_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:
-----------
Merge branch 'master' into ticketing
Commit: ef81a4c11a46d60e28e99d8bf9438e7d0c7656d1
https://github.com/dhis2/dhis2-docs/commit/ef81a4c11a46d60e28e99d8bf9438e7d0c7656d1
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_dashboard.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge pull request #44 from dhis2/ticketing
Added information about the new features regarding message conversation "tickets"
Commit: 453f0974f780c7b3cfa4b088628a985e4a19cf12
https://github.com/dhis2/dhis2-docs/commit/453f0974f780c7b3cfa4b088628a985e4a19cf12
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_dashboard.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' into docinprogress
Commit: 5ba33d605eac0aad5f389814ec1e29d6ddefca52
https://github.com/dhis2/dhis2-docs/commit/5ba33d605eac0aad5f389814ec1e29d6ddefca52
Author: Yrjan A. F. Fraschetti <yrjanaff@MacBook-Pro.local>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
Log Message:
-----------
Answered comment and added descriptive text
Commit: d3ed3207bf4b50850fae17543ad30bb8f736dd08
https://github.com/dhis2/dhis2-docs/commit/d3ed3207bf4b50850fae17543ad30bb8f736dd08
Author: Yrjan A. F. Fraschetti <yrjanaff@MacBook-Pro.local>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
Log Message:
-----------
Small fix in using usage analytics
Commit: 3f7463fbc5038144521c60bd817b72d86cc805a6
https://github.com/dhis2/dhis2-docs/commit/3f7463fbc5038144521c60bd817b72d86cc805a6
Author: Yrjan A. F. Fraschetti <yrjanaff@MacBook-Pro.local>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Edited Data usage analytics section, and added a top favorites under section
Commit: 72df2f037d4e81f7febc040bb1fe213b4340fb72
https://github.com/dhis2/dhis2-docs/commit/72df2f037d4e81f7febc040bb1fe213b4340fb72
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_dashboard.xml
Log Message:
-----------
Messages: Review and update of old and new content
Commit: 7122d6bf7d55bab040254da861c49b154d995082
https://github.com/dhis2/dhis2-docs/commit/7122d6bf7d55bab040254da861c49b154d995082
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/docinprogress' into docinprogress
Commit: 35c8c4a526aeacc33621658e071f2c95b287d289
https://github.com/dhis2/dhis2-docs/commit/35c8c4a526aeacc33621658e071f2c95b287d289
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_dashboard.xml
M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge pull request #53 from dhis2/docinprogress
Merge latest changes on Docinprogress in master
Commit: d86bc95b32cab316c2f24fac45b27b0169b759bd
https://github.com/dhis2/dhis2-docs/commit/d86bc95b32cab316c2f24fac45b27b0169b759bd
Author: rachael <rachael@xxxxxxxxx>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_datasets_forms.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into use-cases
Commit: 7433936afb23c0acd2f413cf8a6e78c02f85793b
https://github.com/dhis2/dhis2-docs/commit/7433936afb23c0acd2f413cf8a6e78c02f85793b
Author: rachael <rachael@xxxxxxxxx>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M .travis.yml
M .utility/deploy.sh
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
M src/docbkx/en/dhis2_android_user_man_aggregate.xml
M src/docbkx/en/dhis2_database.xml
M src/docbkx/en/dhis2_database_schema.xml
M src/docbkx/en/dhis2_developer_manual.xml
M src/docbkx/en/dhis2_documentation_guide.xml
M src/docbkx/en/dhis2_documentation_guide_book.xml
M src/docbkx/en/dhis2_faq.xml
M src/docbkx/en/dhis2_implementation_guide_data_quality.xml
M src/docbkx/en/dhis2_implementation_guide_enduser_training.xml
M src/docbkx/en/dhis2_implementation_guide_indicators.xml
M src/docbkx/en/dhis2_implementation_guide_installation.xml
M src/docbkx/en/dhis2_implementation_guide_integration.xml
M src/docbkx/en/dhis2_preface.xml
M src/docbkx/en/dhis2_r.xml
A src/docbkx/en/dhis2_release_notes.xml
M src/docbkx/en/dhis2_technical_architechture_guide.xml
M src/docbkx/en/dhis2_user_man_approving_data.xml
M src/docbkx/en/dhis2_user_man_apps.xml
M src/docbkx/en/dhis2_user_man_creating_data_quality.xml
M src/docbkx/en/dhis2_user_man_creating_gis.xml
M src/docbkx/en/dhis2_user_man_dashboard.xml
M src/docbkx/en/dhis2_user_man_data_administration.xml
M src/docbkx/en/dhis2_user_man_data_dimensions.xml
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_getting_started.xml
M src/docbkx/en/dhis2_user_man_getting_started_enduser.xml
M src/docbkx/en/dhis2_user_man_getting_started_enduser_ke.xml
M src/docbkx/en/dhis2_user_man_import_export.xml
M src/docbkx/en/dhis2_user_man_indicators.xml
M src/docbkx/en/dhis2_user_man_introduction.xml
M src/docbkx/en/dhis2_user_man_mobile_J2ME_GPRS_3G.xml
M src/docbkx/en/dhis2_user_man_mobile_sms_command.xml
M src/docbkx/en/dhis2_user_man_mobile_web_based.xml
M src/docbkx/en/dhis2_user_man_orgunits.xml
M src/docbkx/en/dhis2_user_man_profile.xml
M src/docbkx/en/dhis2_user_man_settings.xml
M src/docbkx/en/dhis2_user_man_sharing.xml
M src/docbkx/en/dhis2_user_man_tracker.xml
M src/docbkx/en/dhis2_user_man_user_management.xml
M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml
M src/docbkx/en/dhis2_user_man_using_gis.xml
M src/docbkx/en/dhis2_user_man_using_pivot_table.xml
M src/docbkx/en/dhis2_user_man_using_reporting.xml
M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
M src/docbkx/en/dhis2_user_manual_en.xml
M src/docbkx/en/glossary_en.xml
M src/docbkx/en/resources/bookinfo/authorgroup.xml
M src/docbkx/en/resources/bookinfo/bookinfo.xml
M src/docbkx/en/resources/bookinfo/copyright.xml
M src/docbkx/en/resources/bookinfo/keywordset.xml
A src/docbkx/en/resources/images/dhis2_mobile_sms/event-registration-parser.png
A src/docbkx/en/resources/images/icons/info.png
A src/docbkx/en/resources/images/icons/upgrade.png
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
A src/docbkx/en/resources/template/topic_template.xml
M src/docbkx/en/resources/xsl/fop-cust.xsl
M src/docbkx/es/dhis2_documentation_guide_book_es.xml
M src/docbkx/es/dhis2_documentation_guide_es.xml
M src/docbkx/es/dhis2_implementation_guide_data_analysis_tools_overview.xml
M src/docbkx/es/dhis2_implementation_guide_data_elements_and_custom_dimensions.xml
M src/docbkx/es/dhis2_implementation_guide_data_quality.xml
M src/docbkx/es/dhis2_implementation_guide_deployment_strategies.xml
M src/docbkx/es/dhis2_implementation_guide_enduser_training.xml
M src/docbkx/es/dhis2_implementation_guide_es.xml
M src/docbkx/es/dhis2_implementation_guide_indicators.xml
M src/docbkx/es/dhis2_implementation_guide_installation.xml
M src/docbkx/es/dhis2_implementation_guide_integration.xml
M src/docbkx/es/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml
M src/docbkx/es/dhis2_implementation_guide_recommendations.xml
M src/docbkx/es/dhis2_implementation_guide_setting_up_new_database.xml
M src/docbkx/es/dhis2_implementation_guide_short.xml
M src/docbkx/es/dhis2_localization_guide.xml
M src/docbkx/es/dhis2_preface.xml
M src/docbkx/es/dhis2_user_man_creating_data_quality.xml
M src/docbkx/es/dhis2_user_man_creating_gis.xml
M src/docbkx/es/dhis2_user_man_creating_reporting.xml
M src/docbkx/es/dhis2_user_man_dashboard.xml
M src/docbkx/es/dhis2_user_man_data_administration.xml
M src/docbkx/es/dhis2_user_man_data_dimensions.xml
M src/docbkx/es/dhis2_user_man_data_elements.xml
M src/docbkx/es/dhis2_user_man_datasets_forms.xml
M src/docbkx/es/dhis2_user_man_getting_started.xml
M src/docbkx/es/dhis2_user_man_getting_started_enduser.xml
M src/docbkx/es/dhis2_user_man_getting_started_enduser_ke.xml
M src/docbkx/es/dhis2_user_man_import_export.xml
M src/docbkx/es/dhis2_user_man_indicators.xml
M src/docbkx/es/dhis2_user_man_integration.xml
M src/docbkx/es/dhis2_user_man_introduction.xml
M src/docbkx/es/dhis2_user_man_mobile.xml
M src/docbkx/es/dhis2_user_man_mobile_J2ME_GPRS_3G.xml
M src/docbkx/es/dhis2_user_man_mobile_J2ME_sms_transport.xml
M src/docbkx/es/dhis2_user_man_mobile_web_based.xml
M src/docbkx/es/dhis2_user_man_orgunits.xml
M src/docbkx/es/dhis2_user_man_persons_and_programs.xml
M src/docbkx/es/dhis2_user_man_user_management.xml
M src/docbkx/es/dhis2_user_man_using_data_visualizer.xml
M src/docbkx/es/dhis2_user_man_using_gis.xml
M src/docbkx/es/dhis2_user_man_using_reporting.xml
M src/docbkx/es/dhis2_user_man_web_api.xml
M src/docbkx/es/dhis2_user_manual_es.xml
M src/docbkx/es/glossary_es.xml
M src/docbkx/es/resources/bookinfo/authorgroup.xml
M src/docbkx/es/resources/bookinfo/keywordset.xml
M src/docbkx/es/resources/xsl/fop-cust.xsl
M src/docbkx/fr/dhis2_documentation_guide.xml
M src/docbkx/fr/dhis2_documentation_guide_book.xml
M src/docbkx/fr/dhis2_implementation_guide.xml
M src/docbkx/fr/dhis2_implementation_guide_as_a_platform.xml
M src/docbkx/fr/dhis2_implementation_guide_conceptual_design_principles.xml
M src/docbkx/fr/dhis2_implementation_guide_data_quality.xml
M src/docbkx/fr/dhis2_implementation_guide_enduser_training.xml
M src/docbkx/fr/dhis2_implementation_guide_indicators.xml
M src/docbkx/fr/dhis2_implementation_guide_installation.xml
M src/docbkx/fr/dhis2_implementation_guide_integration.xml
M src/docbkx/fr/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml
M src/docbkx/fr/dhis2_implementation_guide_short.xml
M src/docbkx/fr/dhis2_implementation_guide_support.xml
M src/docbkx/fr/dhis2_preface.xml
M src/docbkx/fr/dhis2_user_man_dashboard.xml
M src/docbkx/fr/dhis2_user_man_data_elements.xml
M src/docbkx/fr/dhis2_user_man_data_elements_and_indicators.xml
M src/docbkx/fr/dhis2_user_man_excel_reports.xml
M src/docbkx/fr/dhis2_user_man_getting_started.xml
M src/docbkx/fr/dhis2_user_man_gis.xml
M src/docbkx/fr/dhis2_user_man_introduction.xml
M src/docbkx/fr/dhis2_user_man_orgunits.xml
M src/docbkx/fr/dhis2_user_man_profile.xml
M src/docbkx/fr/dhis2_user_man_reporting.xml
M src/docbkx/fr/dhis2_user_man_using_gis.xml
M src/docbkx/fr/dhis2_user_man_using_reporting.xml
M src/docbkx/fr/dhis2_using_mydatamart_en.xml
M src/docbkx/fr/glossary.xml
M src/docbkx/fr/resources/bookinfo/authorgroup.xml
M src/docbkx/fr/resources/bookinfo/keywordset.xml
M src/docbkx/fr/resources/xsl/fop-cust.xsl
M src/docbkx/fr/resources/xsl/fop-cust_ng.xsl
M src/docbkx/fr/resources/xsl/fop-cust_zm.xsl
M src/docbkx/pt/POSSIBLE_DUPLICATE_dhis2_user_man_indicators_intro.xml
M src/docbkx/pt/dhis2_implementation_guide_data_quality.xml
M src/docbkx/pt/dhis2_implementation_guide_indicators.xml
M src/docbkx/pt/dhis2_implementation_guide_installation.xml
M src/docbkx/pt/dhis2_implementation_guide_integration.xml
M src/docbkx/pt/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml
M src/docbkx/pt/dhis2_implementation_guide_pt.xml
M src/docbkx/pt/dhis2_implementation_guide_short.xml
M src/docbkx/pt/dhis2_user_man_creating_data_quality.xml
M src/docbkx/pt/dhis2_user_man_creating_gis.xml
M src/docbkx/pt/dhis2_user_man_creating_reporting.xml
M src/docbkx/pt/dhis2_user_man_dashboard.xml
M src/docbkx/pt/dhis2_user_man_data_administration.xml
M src/docbkx/pt/dhis2_user_man_data_elements.xml
M src/docbkx/pt/dhis2_user_man_datasets_forms.xml
M src/docbkx/pt/dhis2_user_man_getting_started.xml
M src/docbkx/pt/dhis2_user_man_indicators.xml
M src/docbkx/pt/dhis2_user_man_introduction.xml
M src/docbkx/pt/dhis2_user_man_mobile.xml
M src/docbkx/pt/dhis2_user_man_orgunits.xml
M src/docbkx/pt/dhis2_user_man_persons_and_programs.xml
M src/docbkx/pt/dhis2_user_man_user_management.xml
M src/docbkx/pt/dhis2_user_man_using_gis.xml
M src/docbkx/pt/dhis2_using_mydatamart_en.xml
M src/docbkx/pt/help_content_pt.xml
M src/docbkx/pt/resources/bookinfo/authorgroup.xml
M src/docbkx/pt/resources/bookinfo/keywordset.xml
M src/docbkx/pt/resources/xsl/fop-cust.xsl
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into use-cases
Commit: 685791db297818c6f88f6d8e21f0077b89885349
https://github.com/dhis2/dhis2-docs/commit/685791db297818c6f88f6d8e21f0077b89885349
Author: rachael <rachael@xxxxxxxxx>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
web API message update to content
Compare: https://github.com/dhis2/dhis2-docs/compare/7b425d1089d1...685791db2978
