Merge branch '0.11.1' into 0.12.0

Conflicts:
	technical/releases/server/changelog_server.rst

overview/acknowledgements.rst

@@ -56,4 +56,6 @@ Contributors
 * `Lebanese Alternative Learning <http://lal.ngo>`_ - Arabic (Lebanese) translation and funding for drag and drop quizzes
 * `Last Mile Health <http://lastmilehealth.org/>`_ - Funding for additional development
 * David Gil de Gómez Pérez - technical development, performance improvements and bug fixes
-* `Lex Myers <https://github.com/lexm/>`_
+* `Lex Myers <https://github.com/lexm/>`_
+* `Kawesi Hakim <https://github.com/hakimks>`_
+

technical/releases/app/changelog_android.rst → technical/releases/app/changelog_android_v6.rst

@@ -17,13 +17,19 @@ Issue list:
 * 802: Control when an offline-registered user gets internet access - https://github.com/DigitalCampus/oppia-mobile-android/issues/802
 * 806: Update links to digital-campus/oppiamobile - https://github.com/DigitalCampus/oppia-mobile-android/issues/806
 * 807: Update links to community site - https://github.com/DigitalCampus/oppia-mobile-android/issues/807
+* 602: Numerical input type questions shows JSON text on feedback content - https://github.com/DigitalCampus/oppia-mobile-android/issues/602
+* 767: Pre-test pop up still appears after pre-test has been completed - https://github.com/DigitalCampus/oppia-mobile-android/issues/767
+* 805: Possible bug: android.os.FileUriExposedException: file exposed beyond app through Intent.getData() - https://github.com/DigitalCampus/oppia-mobile-android/issues/805
+* 824: com.github.fabioCollini:DaggerMock:0.6.2 in the app gradle file - https://github.com/DigitalCampus/oppia-mobile-android/issues/824
 
 Issues fixed in previous version/s - but recently updated on Github issue lists:
 
 * 708: Course & Activity getTitle - https://github.com/DigitalCampus/oppia-mobile-android/issues/708
 * 679: Update and solve dependencies for Gradle v3.+ - https://github.com/DigitalCampus/oppia-mobile-android/issues/679
 * 524: Launch activity from an SMS message - https://github.com/DigitalCampus/oppia-mobile-android/issues/524
 * 252: In quizzes how to shuffle the response options - https://github.com/DigitalCampus/oppia-mobile-android/issues/252
+* 813: v6.8.0 does not send data to the server - https://github.com/DigitalCampus/oppia-mobile-android/issues/813
+* 814: Reconnecting Devices over Bluetooth - https://github.com/DigitalCampus/oppia-mobile-android/issues/814
 
 .. _appv67:
 

technical/releases/index.rst

@@ -21,7 +21,7 @@ OppiaMobile Client App (Android)
 .. toctree::
    :maxdepth: 2
 
-   app/changelog_android
+   app/changelog_android_v6
 
 OppiaMobile export block for Moodle
 ------------------------------------- 

technical/releases/server/changelog_server_v0.11.rst

@@ -10,6 +10,9 @@ v0.11.1 - not yet released
 
 Key updates:
 
+* Documentation moved to its own repository: https://github.com/DigitalCampus/oppia-docs
+* Interface for customising the points for individual activities
+
 Issue list:
 
 * 600: On about page use download link from the server settings - https://github.com/DigitalCampus/django-oppia/issues/600
@@ -23,6 +26,13 @@ Issue list:
 * 572: Update/review docs for how the offline registration works - https://github.com/DigitalCampus/django-oppia/issues/572
 * 593: Make email and phone no optional on registration - https://github.com/DigitalCampus/django-oppia/issues/593
 * 602: Move the docs to their own repository - https://github.com/DigitalCampus/django-oppia/issues/602
+* 619: Gamification - for the course global point check it doesn't read from the baseline custom points - https://github.com/DigitalCampus/django-oppia/issues/619
+* 616: Add events/points to the Gamification db tables - https://github.com/DigitalCampus/django-oppia/issues/616
+* 615: Editing points for individual activities - https://github.com/DigitalCampus/django-oppia/issues/615
+* 614: Check that all gamification points are loaded from the defaults - https://github.com/DigitalCampus/django-oppia/issues/614
+* 617: Update the course version no when the points are updated - https://github.com/DigitalCampus/django-oppia/issues/617
+* 619: Gamifcation - for the course global point check it doesn't read from the baseline custom points - https://github.com/DigitalCampus/django-oppia/issues/619
+* 613: course_xml_reader.py no longer used - https://github.com/DigitalCampus/django-oppia/issues/613
 
 .. _serverv0.11.0: