dhis2-documenters team mailing list archive
-
dhis2-documenters team
-
Mailing list archive
-
Message #01076
[dhis2/dhis2-docs] 8d2082: Merge remote-tracking branch 'refs/remotes/origin/...
Branch: refs/heads/use-cases
Home: https://github.com/dhis2/dhis2-docs
Commit: 8d2082ff8c49add71a7780055e3759d6277afd19
https://github.com/dhis2/dhis2-docs/commit/8d2082ff8c49add71a7780055e3759d6277afd19
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-25 (Mon, 25 Apr 2016)
Changed paths:
M src/docbkx/en/resources/bookinfo/bookinfo.xml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress
Commit: 4ec71a70dc76c4e0090b5c0ea94212c5261528e5
https://github.com/dhis2/dhis2-docs/commit/4ec71a70dc76c4e0090b5c0ea94212c5261528e5
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-26 (Tue, 26 Apr 2016)
Changed paths:
M .gitmodules
M .utility/index.html
M pom.xml
M src/docbkx/en/ccei_user_manual_en.xml
M src/docbkx/en/dhis2_android_user_man_aggregate.xml
M src/docbkx/en/dhis2_android_user_man_event_capture.xml
M src/docbkx/en/dhis2_android_user_man_tracker_capture.xml
M src/docbkx/en/dhis2_bibliography.xml
M src/docbkx/en/dhis2_documentation_guide.xml
M src/docbkx/en/dhis2_implementation_guide_enduser_training.xml
M src/docbkx/en/dhis2_implementation_guide_installation.xml
M src/docbkx/en/dhis2_implementation_guide_support.xml
M src/docbkx/en/dhis2_localization_guide.xml
M src/docbkx/en/dhis2_preface.xml
M src/docbkx/en/dhis2_technical_architechture_guide.xml
M src/docbkx/en/dhis2_user_man_apps.xml
M src/docbkx/en/dhis2_user_man_creating_gis.xml
M src/docbkx/en/dhis2_user_man_data_dimensions.xml
M src/docbkx/en/dhis2_user_man_getting_started.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_program_indicators.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_web_api.xml
M src/docbkx/en/resources/bookinfo/bookinfo.xml
M src/docbkx/en/resources/bookinfo/legalnotice.xml
M src/docbkx/en/resources/xsl/fop-cust.xsl
M src/docbkx/es/dhis2_documentation_guide_es.xml
M src/docbkx/es/dhis2_implementation_guide_enduser_training.xml
M src/docbkx/es/dhis2_implementation_guide_installation.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_gis.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_integration.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_web_api.xml
M src/docbkx/es/resources/bookinfo/legalnotice.xml
M src/docbkx/fr/dhis2_documentation_guide.xml
M src/docbkx/fr/dhis2_implementation_guide_enduser_training.xml
M src/docbkx/fr/dhis2_implementation_guide_installation.xml
M src/docbkx/fr/dhis2_implementation_guide_short.xml
M src/docbkx/fr/dhis2_implementation_guide_support.xml
M src/docbkx/fr/dhis2_localization_guide.xml
M src/docbkx/fr/dhis2_preface.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_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/resources/bookinfo/legalnotice.xml
M src/docbkx/pt/dhis2_implementation_guide_installation.xml
M src/docbkx/pt/dhis2_implementation_guide_short.xml
M src/docbkx/pt/dhis2_implementation_guide_support.xml
M src/docbkx/pt/dhis2_user_man_creating_gis.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_introduction.xml
M src/docbkx/pt/dhis2_user_man_settings.xml
M src/docbkx/pt/help_content_pt.xml
M src/docbkx/pt/resources/bookinfo/legalnotice.xml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress
Commit: 6cf19dd23b712055579e1c42c9188f4372321c78
https://github.com/dhis2/dhis2-docs/commit/6cf19dd23b712055579e1c42c9188f4372321c78
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-26 (Tue, 26 Apr 2016)
Changed paths:
M .gitignore
M .travis.yml
A src/docbkx/build.properties
M src/docbkx/en/dhis2_android_user_man.xml
M src/docbkx/en/dhis2_preface.xml
M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
M src/docbkx/en/dhis2_user_manual_en.xml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress
Commit: 2bacf42fb9727e1d674c3fb825aca50d888177b4
https://github.com/dhis2/dhis2-docs/commit/2bacf42fb9727e1d674c3fb825aca50d888177b4
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-26 (Tue, 26 Apr 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
M src/docbkx/en/dhis2_user_man_using_pivot_table.xml
Log Message:
-----------
Major changes to Data Visualizer, minor change to Pivot table.
Commit: 3b4a4e908597e5e5841f6fe3560d5e4306858bb7
https://github.com/dhis2/dhis2-docs/commit/3b4a4e908597e5e5841f6fe3560d5e4306858bb7
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-26 (Tue, 26 Apr 2016)
Changed paths:
M .gitignore
R src/docbkx/build.properties
M src/docbkx/en/resources/bookinfo/bookinfo.xml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress
Commit: f82b7b3d7b5ae42fcca4c1dcfef54d44ef653d16
https://github.com/dhis2/dhis2-docs/commit/f82b7b3d7b5ae42fcca4c1dcfef54d44ef653d16
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-26 (Tue, 26 Apr 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
A src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
M src/docbkx/en/dhis2_user_manual_en.xml
Log Message:
-----------
Usage Analytics: created topic and content; Data Visualizer: minor edits
Added xref from User Manual doc to Usage Analytics topic.
Commit: f6b2137502a5dd402173e39a81274be4d7afab1d
https://github.com/dhis2/dhis2-docs/commit/f6b2137502a5dd402173e39a81274be4d7afab1d
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-27 (Wed, 27 Apr 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_program_rules.xml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress
Commit: 5aff85c6db13ee70562f90d053f2d78329f82bcc
https://github.com/dhis2/dhis2-docs/commit/5aff85c6db13ee70562f90d053f2d78329f82bcc
Author: Yrjan A. F. Fraschetti <yrjanaff@xxxxxxxxxxxxxxxxxxxxxxxx>
Date: 2016-04-27 (Wed, 27 Apr 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Updated repsonse format in data usage analytics
Commit: 500101166b8fe4b6c520e043ebf3aa8e024ea450
https://github.com/dhis2/dhis2-docs/commit/500101166b8fe4b6c520e043ebf3aa8e024ea450
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-27 (Wed, 27 Apr 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress
Commit: 93e73ede1da80645624a69ef7d6304aa202de51c
https://github.com/dhis2/dhis2-docs/commit/93e73ede1da80645624a69ef7d6304aa202de51c
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-27 (Wed, 27 Apr 2016)
Changed paths:
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_usage_analytics.xml
Log Message:
-----------
Event Visualizer: major rework; Data Visualizer: major edits; Usage Analytics: further review
Commit: 32b97ea457e50118dd917550766b4062bf51733d
https://github.com/dhis2/dhis2-docs/commit/32b97ea457e50118dd917550766b4062bf51733d
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-04-27 (Wed, 27 Apr 2016)
Changed paths:
M pom.xml
Log Message:
-----------
Back by popular demand..webhelp and epub.
Commit: 5012044e0c75f3c824003c4cb31ac4d57a25cef0
https://github.com/dhis2/dhis2-docs/commit/5012044e0c75f3c824003c4cb31ac4d57a25cef0
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-28 (Thu, 28 Apr 2016)
Changed paths:
M pom.xml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress
Commit: 4b78fc5d304ae8ece491e49465f13d934e786a5a
https://github.com/dhis2/dhis2-docs/commit/4b78fc5d304ae8ece491e49465f13d934e786a5a
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-04-28 (Thu, 28 Apr 2016)
Changed paths:
M src/docbkx/en/dhis2_implementation_guide_installation.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Data stats
Commit: 83477dc72ada83eff1a963772755388352d52610
https://github.com/dhis2/dhis2-docs/commit/83477dc72ada83eff1a963772755388352d52610
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-04-28 (Thu, 28 Apr 2016)
Changed paths:
M .travis.yml
M pom.xml
M src/docbkx/en/dhis2_android_user_man.xml
M src/docbkx/en/dhis2_preface.xml
M src/docbkx/en/dhis2_user_man_program_rules.xml
M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
M src/docbkx/en/dhis2_user_manual_en.xml
M src/docbkx/en/resources/bookinfo/bookinfo.xml
Log Message:
-----------
Merge branch 'master' of github.com:dhis2/dhis2-docs
Commit: a794b878fc0acfcd8c5ca85e10051477cf4a3ab3
https://github.com/dhis2/dhis2-docs/commit/a794b878fc0acfcd8c5ca85e10051477cf4a3ab3
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-04-28 (Thu, 28 Apr 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Minor clarifications / adjustment in API section.
Commit: b5509a7a8172d470eb98bb3fd59afc62fc8ec2f5
https://github.com/dhis2/dhis2-docs/commit/b5509a7a8172d470eb98bb3fd59afc62fc8ec2f5
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-04-28 (Thu, 28 Apr 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' of github.com:dhis2/dhis2-docs
Commit: 1136c02250e5c8eeb2537e805efe2c9bb7efd749
https://github.com/dhis2/dhis2-docs/commit/1136c02250e5c8eeb2537e805efe2c9bb7efd749
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-28 (Thu, 28 Apr 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 remote-tracking branch 'refs/remotes/origin/master' into docinprogress
Commit: ae9f69295bdc5371db263dd6b626749bc8f2a771
https://github.com/dhis2/dhis2-docs/commit/ae9f69295bdc5371db263dd6b626749bc8f2a771
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-04-28 (Thu, 28 Apr 2016)
Changed paths:
M .travis.yml
Log Message:
-----------
Enable docinprogress Travis build.
Commit: 9e40a5793fd122a3542eceea3d94c2e18bbef25e
https://github.com/dhis2/dhis2-docs/commit/9e40a5793fd122a3542eceea3d94c2e18bbef25e
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-28 (Thu, 28 Apr 2016)
Changed paths:
M .travis.yml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress
Commit: a8d77850f6ffc3a83ff1b21360867e87ef61ad2b
https://github.com/dhis2/dhis2-docs/commit/a8d77850f6ffc3a83ff1b21360867e87ef61ad2b
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-28 (Thu, 28 Apr 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml
M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
A src/docbkx/en/resources/images/usage_analytics/usage_analytics_interface.png
Log Message:
-----------
Event visualizer: major edits; Usage Analytics: info added and reviewed
Commit: 5a3a7aa9eabe2a1d74614cb56aa7d2390e669ca2
https://github.com/dhis2/dhis2-docs/commit/5a3a7aa9eabe2a1d74614cb56aa7d2390e669ca2
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-29 (Fri, 29 Apr 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml
M src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
Log Message:
-----------
Event Visualizer: minor edits; Usage Analytics: minor edits.
Commit: f7f9badda2737de402b1cfd59d71b95401600ca9
https://github.com/dhis2/dhis2-docs/commit/f7f9badda2737de402b1cfd59d71b95401600ca9
Author: Jason Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-04-29 (Fri, 29 Apr 2016)
Changed paths:
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_pivot_table.xml
A src/docbkx/en/dhis2_user_man_using_usage_analytics.xml
M src/docbkx/en/dhis2_user_manual_en.xml
A src/docbkx/en/resources/images/usage_analytics/usage_analytics_interface.png
Log Message:
-----------
Merge pull request #32 from dhis2/docinprogress
Major review of analytics apps topics. Created Usage Analytics topic.
Commit: f4b6f3aba96efc71fd3cabc27888ff28bb99f5b3
https://github.com/dhis2/dhis2-docs/commit/f4b6f3aba96efc71fd3cabc27888ff28bb99f5b3
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-29 (Fri, 29 Apr 2016)
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress
Commit: f21fc60bc468de44dab282f19dd900cae4e40d05
https://github.com/dhis2/dhis2-docs/commit/f21fc60bc468de44dab282f19dd900cae4e40d05
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-29 (Fri, 29 Apr 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_event_reports.xml
M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml
Log Message:
-----------
Event Reports: major restructuring and edits; Event Visualizer: minor edits.
Commit: 219d13a17e04b3c7dd9c12fbd5be2e2517922cd8
https://github.com/dhis2/dhis2-docs/commit/219d13a17e04b3c7dd9c12fbd5be2e2517922cd8
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-04-29 (Fri, 29 Apr 2016)
Changed paths:
M pom.xml
Log Message:
-----------
Relaxed maven version requirement to 3.0.5. Included new chapter usage analytics in root file.
Commit: 2a9677c4d538211c819ff661035f9bfe7ee7da73
https://github.com/dhis2/dhis2-docs/commit/2a9677c4d538211c819ff661035f9bfe7ee7da73
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-29 (Fri, 29 Apr 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_event_reports.xml
Log Message:
-----------
Event reports: minor edit
Commit: 1dcb5c7f1b4214b4a09e991e94e691df84610c04
https://github.com/dhis2/dhis2-docs/commit/1dcb5c7f1b4214b4a09e991e94e691df84610c04
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-04-29 (Fri, 29 Apr 2016)
Changed paths:
M pom.xml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress
Commit: 6596b638bd8694b07a6f01a0352baa3ba33245a6
https://github.com/dhis2/dhis2-docs/commit/6596b638bd8694b07a6f01a0352baa3ba33245a6
Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
Date: 2016-05-02 (Mon, 02 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
minor update, document merge mode name change
Commit: b59e4c66cf9540f533af4a0d63b8df171ec3abe0
https://github.com/dhis2/dhis2-docs/commit/b59e4c66cf9540f533af4a0d63b8df171ec3abe0
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-05-02 (Mon, 02 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress
Commit: 9e4fd00ad2a4a871068b96cd267eaa10e4055cd5
https://github.com/dhis2/dhis2-docs/commit/9e4fd00ad2a4a871068b96cd267eaa10e4055cd5
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-05-02 (Mon, 02 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Data usage analytics: major edits
Commit: 13855a72582327c051724e1b1f61012bb4503965
https://github.com/dhis2/dhis2-docs/commit/13855a72582327c051724e1b1f61012bb4503965
Author: Mark Polak <mark@xxxxxxxxxxxxxxx>
Date: 2016-05-02 (Mon, 02 May 2016)
Changed paths:
M .travis.yml
Log Message:
-----------
Correct syntax error in .travis.yml
Commit: 34d0688f39c7a8f73b8d2b6660ee9e714c6743d8
https://github.com/dhis2/dhis2-docs/commit/34d0688f39c7a8f73b8d2b6660ee9e714c6743d8
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-05-02 (Mon, 02 May 2016)
Changed paths:
M .travis.yml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress
Commit: 3e2b8a47c224401bf02b7c153067b6ace7e8cc64
https://github.com/dhis2/dhis2-docs/commit/3e2b8a47c224401bf02b7c153067b6ace7e8cc64
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-03 (Tue, 03 May 2016)
Changed paths:
M src/docbkx/en/dhis2_implementation_guide_installation.xml
Log Message:
-----------
Install
Commit: 58deb52f8893a0a57149732f5c2569a70cd2c063
https://github.com/dhis2/dhis2-docs/commit/58deb52f8893a0a57149732f5c2569a70cd2c063
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-03 (Tue, 03 May 2016)
Changed paths:
M .travis.yml
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' of github.com:dhis2/dhis2-docs
Commit: 4fb035d75ef22c30e6c13659a516d8455e512ac0
https://github.com/dhis2/dhis2-docs/commit/4fb035d75ef22c30e6c13659a516d8455e512ac0
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-05-03 (Tue, 03 May 2016)
Changed paths:
M src/docbkx/en/dhis2_implementation_guide_installation.xml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into docinprogress
Commit: 4682db773aa0b8869521ad42617898cb4e96b88c
https://github.com/dhis2/dhis2-docs/commit/4682db773aa0b8869521ad42617898cb4e96b88c
Author: ceciliapersson <cecilia@xxxxxxxxx>
Date: 2016-05-03 (Tue, 03 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_event_reports.xml
M src/docbkx/en/resources/images/event_report/event_report.png
Log Message:
-----------
Event Reports: final edits, screen shot updated
Commit: 019001b851905c9a6c55e80fd91a5e835f07cb86
https://github.com/dhis2/dhis2-docs/commit/019001b851905c9a6c55e80fd91a5e835f07cb86
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-03 (Tue, 03 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Data sets
Commit: aa73af1d898f78c673e1d37bc10ad8f90373a473
https://github.com/dhis2/dhis2-docs/commit/aa73af1d898f78c673e1d37bc10ad8f90373a473
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-04 (Wed, 04 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_event_reports.xml
M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
M src/docbkx/en/resources/images/event_report/event_report.png
Log Message:
-----------
Merge pull request #33 from dhis2/docinprogress
Event reports: reviewed and updated
Commit: f7c12981847b7c7766b6b61843716c9288aa4fe0
https://github.com/dhis2/dhis2-docs/commit/f7c12981847b7c7766b6b61843716c9288aa4fe0
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-04 (Wed, 04 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Settings
Commit: 48fedc7884a709ec23eb196f98a142655e41cc50
https://github.com/dhis2/dhis2-docs/commit/48fedc7884a709ec23eb196f98a142655e41cc50
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-04 (Wed, 04 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_using_event_reports.xml
M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
M src/docbkx/en/resources/images/event_report/event_report.png
Log Message:
-----------
Merge branch 'master' of github.com:dhis2/dhis2-docs
Commit: c76010763becdbcea907a43f77eaef4d10483f54
https://github.com/dhis2/dhis2-docs/commit/c76010763becdbcea907a43f77eaef4d10483f54
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-05 (Thu, 05 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
API, tokens
Commit: fb169087a57151ecf70d32cc0adae5083e054fde
https://github.com/dhis2/dhis2-docs/commit/fb169087a57151ecf70d32cc0adae5083e054fde
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-05 (Thu, 05 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Minor
Commit: d716b07e995136e351f796bd67963b9eaba9a46b
https://github.com/dhis2/dhis2-docs/commit/d716b07e995136e351f796bd67963b9eaba9a46b
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-05 (Thu, 05 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Minor
Commit: 3378d6ee6b98f0fa88ab9ed7545bead78a68712c
https://github.com/dhis2/dhis2-docs/commit/3378d6ee6b98f0fa88ab9ed7545bead78a68712c
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-05 (Thu, 05 May 2016)
Changed paths:
M src/docbkx/en/dhis2_implementation_guide_installation.xml
Log Message:
-----------
Google service account setup
Commit: 429d91bd06d6a5f1d6ddd28310a415709e894555
https://github.com/dhis2/dhis2-docs/commit/429d91bd06d6a5f1d6ddd28310a415709e894555
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-05 (Thu, 05 May 2016)
Changed paths:
M src/docbkx/en/dhis2_implementation_guide_installation.xml
Log Message:
-----------
Minor
Commit: 58068dc5a8cd077497466cf73ecdca6613178d19
https://github.com/dhis2/dhis2-docs/commit/58068dc5a8cd077497466cf73ecdca6613178d19
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-05 (Thu, 05 May 2016)
Changed paths:
M src/docbkx/en/dhis2_implementation_guide_installation.xml
Log Message:
-----------
Minor
Commit: c6ad037fa2b4ecb5416d993694e4a539ef077ae4
https://github.com/dhis2/dhis2-docs/commit/c6ad037fa2b4ecb5416d993694e4a539ef077ae4
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-05 (Thu, 05 May 2016)
Changed paths:
M src/docbkx/en/dhis2_implementation_guide_installation.xml
Log Message:
-----------
Minor
Commit: 8454b97cbc42152ed0505a1c807731bfe074d472
https://github.com/dhis2/dhis2-docs/commit/8454b97cbc42152ed0505a1c807731bfe074d472
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-05 (Thu, 05 May 2016)
Changed paths:
M src/docbkx/en/dhis2_implementation_guide_installation.xml
Log Message:
-----------
Typo
Commit: 5fb32bce1ffd6712042bc41f06fc4827b22c43e4
https://github.com/dhis2/dhis2-docs/commit/5fb32bce1ffd6712042bc41f06fc4827b22c43e4
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-05 (Thu, 05 May 2016)
Changed paths:
M src/docbkx/en/dhis2_implementation_guide_installation.xml
Log Message:
-----------
Typo
Commit: 0b5f8bc6961567c59ffc6f798b60dcd2a013b31f
https://github.com/dhis2/dhis2-docs/commit/0b5f8bc6961567c59ffc6f798b60dcd2a013b31f
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-06 (Fri, 06 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 remote-tracking branch 'dhis2/master' into dhis2/docinprogress
Commit: 64f7030f257c96f8f407cd378edae39d0aba277b
https://github.com/dhis2/dhis2-docs/commit/64f7030f257c96f8f407cd378edae39d0aba277b
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 remote-tracking branch 'dhis2/master' into dhis2/docinprogress
Commit: 364b703746233e0c3e729bf0cd66535bd5027617
https://github.com/dhis2/dhis2-docs/commit/364b703746233e0c3e729bf0cd66535bd5027617
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-09 (Mon, 09 May 2016)
Log Message:
-----------
Merge branch 'Test--create-new-folders-and-topic-template' into dhis2/docinprogress
Commit: a3cbffa840ed69e67c8d4fbb60ed6c4144c59e55
https://github.com/dhis2/dhis2-docs/commit/a3cbffa840ed69e67c8d4fbb60ed6c4144c59e55
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-09 (Mon, 09 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_tracker.xml
A src/docbkx/en/resources/content/topictemplate.xml
A src/docbkx/en/resources/content/tracker/concept/tracker_concept.xml
Log Message:
-----------
Test
Commit: d4b7c41b4ea97b6dbe0d0d5e3998548ed26f01c9
https://github.com/dhis2/dhis2-docs/commit/d4b7c41b4ea97b6dbe0d0d5e3998548ed26f01c9
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-09 (Mon, 09 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_tracker.xml
A src/docbkx/en/resources/content/topictemplate.xml
A src/docbkx/en/resources/content/tracker/concept/tracker_concept.xml
Log Message:
-----------
Merge pull request #1 from ceciliapersson/Test--create-new-folders-and-topic-template
Test
Commit: 5c2e45f7e29ebf72ffb16294de72f7f40dcc0292
https://github.com/dhis2/dhis2-docs/commit/5c2e45f7e29ebf72ffb16294de72f7f40dcc0292
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-09 (Mon, 09 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_tracker.xml
A src/docbkx/en/resources/content/topictemplate.xml
A src/docbkx/en/resources/content/tracker/concept/tracker_concept.xml
Log Message:
-----------
Merge pull request #34 from ceciliapersson/dhis2/docinprogress
Dhis2/docinprogress
Commit: 45c6dd9d51014d19c027c460c453b798980a6f1c
https://github.com/dhis2/dhis2-docs/commit/45c6dd9d51014d19c027c460c453b798980a6f1c
Author: Cecilia Persson <cecilia@xxxxxxxxx>
Date: 2016-05-09 (Mon, 09 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_tracker.xml
R src/docbkx/en/resources/content/topictemplate.xml
R src/docbkx/en/resources/content/tracker/concept/tracker_concept.xml
Log Message:
-----------
Revert "Merge pull request #34 from ceciliapersson/dhis2/docinprogress"
This reverts commit 5c2e45f7e29ebf72ffb16294de72f7f40dcc0292, reversing
changes made to 5fb32bce1ffd6712042bc41f06fc4827b22c43e4.
Commit: a7f1364f8aa8b0664a52260f31a8f86660ee2751
https://github.com/dhis2/dhis2-docs/commit/a7f1364f8aa8b0664a52260f31a8f86660ee2751
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-09 (Mon, 09 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Analytics
Commit: 1662ca1af721307d2757fb341d6b984bbf014f85
https://github.com/dhis2/dhis2-docs/commit/1662ca1af721307d2757fb341d6b984bbf014f85
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-09 (Mon, 09 May 2016)
Log Message:
-----------
Merge branch 'master' of github.com:dhis2/dhis2-docs
Commit: 758566850203382f4eeae128c0bb61d9da66b919
https://github.com/dhis2/dhis2-docs/commit/758566850203382f4eeae128c0bb61d9da66b919
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-09 (Mon, 09 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Minor
Commit: e049500d67a70693b44c0539ddcb7792f863889d
https://github.com/dhis2/dhis2-docs/commit/e049500d67a70693b44c0539ddcb7792f863889d
Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
Date: 2016-05-10 (Tue, 10 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
minor bugfix, change importStrategy => strategy for bulk deletion API
Commit: dd97d4a6c4c1e353c67f8249b87479c776554995
https://github.com/dhis2/dhis2-docs/commit/dd97d4a6c4c1e353c67f8249b87479c776554995
Author: Greg <drakos7@xxxxxxxxx>
Date: 2016-05-11 (Wed, 11 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_apps.xml
Log Message:
-----------
2.2. Creating Apps spelling correction
Commit: 3a6e47ea7a054f95967b3d0a0671fc649b7878c0
https://github.com/dhis2/dhis2-docs/commit/3a6e47ea7a054f95967b3d0a0671fc649b7878c0
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-12 (Thu, 12 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
API
Commit: 49b1b968b85656cbfbd92034801cb3b574f51091
https://github.com/dhis2/dhis2-docs/commit/49b1b968b85656cbfbd92034801cb3b574f51091
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-12 (Thu, 12 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_apps.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Merge branch 'master' of github.com:dhis2/dhis2-docs
Commit: 41a588ebe054cebad301b098cf010bc3642d944f
https://github.com/dhis2/dhis2-docs/commit/41a588ebe054cebad301b098cf010bc3642d944f
Author: zubaira <zubaira@xxxxxxxxxx>
Date: 2016-05-13 (Fri, 13 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
Log Message:
-----------
Gateway Config Modified
Commit: 2e2a81b37b60e9a5d6ed28ea52c459c554daeb9f
https://github.com/dhis2/dhis2-docs/commit/2e2a81b37b60e9a5d6ed28ea52c459c554daeb9f
Author: zubaira <zubaira@xxxxxxxxxx>
Date: 2016-05-13 (Fri, 13 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
SMS API Modified
Commit: b9e1b446e2d8bfb327319045c82b063a42905e57
https://github.com/dhis2/dhis2-docs/commit/b9e1b446e2d8bfb327319045c82b063a42905e57
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-16 (Mon, 16 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Analytics api
Commit: e598cc39ac24dd5e33a8f2ebdaabfee3629799c5
https://github.com/dhis2/dhis2-docs/commit/e598cc39ac24dd5e33a8f2ebdaabfee3629799c5
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-16 (Mon, 16 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Analytics tip
Commit: 75f38cbb51c7bc19bda88661117a9dfc7d3d9289
https://github.com/dhis2/dhis2-docs/commit/75f38cbb51c7bc19bda88661117a9dfc7d3d9289
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-16 (Mon, 16 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' of github.com:dhis2/dhis2-docs
Commit: e80d33fb9f7bb1970a2ef675e4dfbc646e7c79f9
https://github.com/dhis2/dhis2-docs/commit/e80d33fb9f7bb1970a2ef675e4dfbc646e7c79f9
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-05-16 (Mon, 16 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
Analytics, groups
Commit: 52a85c8bf73b1963c559f2e9070c7c9313e3ed6a
https://github.com/dhis2/dhis2-docs/commit/52a85c8bf73b1963c559f2e9070c7c9313e3ed6a
Author: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
Date: 2016-05-20 (Fri, 20 May 2016)
Changed paths:
A src/docbkx/en/resources/xsl/glossary_to_po.xsl
Log Message:
-----------
Adding XSL to transform glossary to POT file.
Commit: db1aa89c9267cc304977f9e1b845781272a8b74e
https://github.com/dhis2/dhis2-docs/commit/db1aa89c9267cc304977f9e1b845781272a8b74e
Author: zubaira <zubaira@xxxxxxxxxx>
Date: 2016-05-23 (Mon, 23 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
Log Message:
-----------
gateway configurations modified
Commit: c3e9b90f219dad33498878e32b6a57b961a867df
https://github.com/dhis2/dhis2-docs/commit/c3e9b90f219dad33498878e32b6a57b961a867df
Author: zubaira <zubaira@xxxxxxxxxx>
Date: 2016-05-23 (Mon, 23 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:
-----------
gateway configuration snapshot
Commit: f0a99e2deb69904d19a218b208d5a51446c79dd0
https://github.com/dhis2/dhis2-docs/commit/f0a99e2deb69904d19a218b208d5a51446c79dd0
Author: zubaira <zubaira@xxxxxxxxxx>
Date: 2016-05-24 (Tue, 24 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
Log Message:
-----------
gateway configurations updated
Commit: 914d177928411ccc842f3cce84640c4437e6b483
https://github.com/dhis2/dhis2-docs/commit/914d177928411ccc842f3cce84640c4437e6b483
Author: zubaira <zubaira@xxxxxxxxxx>
Date: 2016-05-24 (Tue, 24 May 2016)
Changed paths:
M src/docbkx/en/resources/images/dhis2_mobile_sms/gateway_configurations.png
Log Message:
-----------
gateway configuration screen shot
Commit: 2b63ea44b5a70bf4e26d2a1754277e2eb8f17ff6
https://github.com/dhis2/dhis2-docs/commit/2b63ea44b5a70bf4e26d2a1754277e2eb8f17ff6
Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
various minor fixes
Commit: 93c076d64e954dcc43a9cd83b919ac755db7282b
https://github.com/dhis2/dhis2-docs/commit/93c076d64e954dcc43a9cd83b919ac755db7282b
Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
removed quotes from event examples, only needed for XML
Commit: 340e034c4d0bf277acb56b2be68ec03a18861a74
https://github.com/dhis2/dhis2-docs/commit/340e034c4d0bf277acb56b2be68ec03a18861a74
Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
document create + enroll TEI in one go
Commit: 6b6e6346d109a52645dc6792ec67312f13510d92
https://github.com/dhis2/dhis2-docs/commit/6b6e6346d109a52645dc6792ec67312f13510d92
Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
minor create tei+enroll update
Commit: 9bd50d50911e800595d2585224d23e9acf487383
https://github.com/dhis2/dhis2-docs/commit/9bd50d50911e800595d2585224d23e9acf487383
Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
add /24/ to api URLs, wip
Commit: e77f435826c66039ff2498207843b1f1184b9455
https://github.com/dhis2/dhis2-docs/commit/e77f435826c66039ff2498207843b1f1184b9455
Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
add /24/ to api URLs, wip
Commit: f0a60e47d667effd718f338b1aad5ec57e5686fb
https://github.com/dhis2/dhis2-docs/commit/f0a60e47d667effd718f338b1aad5ec57e5686fb
Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
add /24/ to api URLs, wip
Commit: b271adaf3733b71e061026996316fbba5836133b
https://github.com/dhis2/dhis2-docs/commit/b271adaf3733b71e061026996316fbba5836133b
Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
add /24/ to api URLs, wip
Commit: 711fb911ce1b3196366af548f522a3aedb1afe40
https://github.com/dhis2/dhis2-docs/commit/711fb911ce1b3196366af548f522a3aedb1afe40
Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
add /24/ to api URLs, wip
Commit: 30257498769a64349aea2fd75c63b83611fdb995
https://github.com/dhis2/dhis2-docs/commit/30257498769a64349aea2fd75c63b83611fdb995
Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
update URL for fred api, now located at /ohie/fred/v1
Commit: c205c9da5c5f18d4fcbe2bc343d3931aeaa5a23b
https://github.com/dhis2/dhis2-docs/commit/c205c9da5c5f18d4fcbe2bc343d3931aeaa5a23b
Author: Morten Olav Hansen <mortenoh@xxxxxxxxx>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
change old apps.dhis2.org link to play.dhis2.org
Commit: 27d7557f773dd30000dc5c8c243d9194bb3e8801
https://github.com/dhis2/dhis2-docs/commit/27d7557f773dd30000dc5c8c243d9194bb3e8801
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
CSV
Commit: 13f2f706b21b7fda5f8d0283d1aa0038d8dc6585
https://github.com/dhis2/dhis2-docs/commit/13f2f706b21b7fda5f8d0283d1aa0038d8dc6585
Author: Lars Helge Overland <larshelge@xxxxxxxxx>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
M src/docbkx/en/dhis2_user_man_web_api.xml
A src/docbkx/en/resources/images/dhis2_mobile_sms/gateway_configurations.png
Log Message:
-----------
Merge branch 'master' of github.com:dhis2/dhis2-docs
Commit: ff014b635681a94bb65361ea83057eb6e902d6f9
https://github.com/dhis2/dhis2-docs/commit/ff014b635681a94bb65361ea83057eb6e902d6f9
Author: zubaira <zubair@xxxxxxxxx>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M src/docbkx/en/dhis2_user_man_web_api.xml
Log Message:
-----------
ProgramMessage docs
Commit: 1bd351eb25ad1974a096a56a0529be9144e8a6ea
https://github.com/dhis2/dhis2-docs/commit/1bd351eb25ad1974a096a56a0529be9144e8a6ea
Author: rachael <rachael@xxxxxxxxx>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M .travis.yml
M pom.xml
M src/docbkx/en/dhis2_implementation_guide_installation.xml
M src/docbkx/en/dhis2_user_man_apps.xml
M src/docbkx/en/dhis2_user_man_mobile_sms_service.xml
M src/docbkx/en/dhis2_user_man_using_data_visualizer.xml
M src/docbkx/en/dhis2_user_man_using_event_reports.xml
M src/docbkx/en/dhis2_user_man_using_event_visualizer.xml
M src/docbkx/en/dhis2_user_man_using_pivot_table.xml
A 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
A src/docbkx/en/resources/images/dhis2_mobile_sms/gateway_configurations.png
M src/docbkx/en/resources/images/event_report/event_report.png
A src/docbkx/en/resources/images/usage_analytics/usage_analytics_interface.png
A src/docbkx/en/resources/xsl/glossary_to_po.xsl
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master' into use-cases
Commit: 7b425d1089d10c416f64f7f2e60a2e1e7149c0d0
https://github.com/dhis2/dhis2-docs/commit/7b425d1089d10c416f64f7f2e60a2e1e7149c0d0
Author: rachael <rachael@xxxxxxxxx>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M src/docbkx/en/use_cases/akros.xml
Log Message:
-----------
use case test
Compare: https://github.com/dhis2/dhis2-docs/compare/264899354e2b...7b425d1089d1
