diff --git a/upgrade.txt b/upgrade.txt index c710ecbeb18..0c3e885f8dd 100644 --- a/upgrade.txt +++ b/upgrade.txt @@ -20,6 +20,7 @@ information provided here is intended especially for developers. ionic state restore * mm-rich-text-editor now admits a new parameter adjust-height (default: true). It admits an HTML DOM Id string or boolean. Specifying it will adjust height of the editor to the selected element. If true it will adjust to the whole page and false will use height parameter instead. * Generators on stores are deprecated. Using generators will make Android < 4.4 fail. Use keyPath instead. They will be automatically generated if needed. DB Functions query, update and where are not allowed using compoung indexes see JSdoc DB functions on db.js for more info. + * A new field has been added to config.json: privacypolicy. === 3.2 === diff --git a/www/config.json b/www/config.json index 82ebf7d1316..1d0876d02c5 100644 --- a/www/config.json +++ b/www/config.json @@ -13,5 +13,6 @@ "customurlscheme": "moodlemobile", "siteurl": "", "skipssoconfirmation": "false", - "forcedefaultlanguage": "false" + "forcedefaultlanguage": "false", + "privacypolicy": "https://moodle.org/mod/page/view.php?id=8148" } diff --git a/www/core/components/settings/controllers/about.js b/www/core/components/settings/controllers/about.js index 00d1cd15741..ec343459ea2 100644 --- a/www/core/components/settings/controllers/about.js +++ b/www/core/components/settings/controllers/about.js @@ -27,6 +27,7 @@ angular.module('mm.core.settings') $scope.versionname = mmCoreConfigConstants.versionname; $scope.appname = mmCoreConfigConstants.appname; $scope.versioncode = mmCoreConfigConstants.versioncode; + $scope.privacyPolicy = mmCoreConfigConstants.privacypolicy; $scope.navigator = $window.navigator; if ($window.location && $window.location.href) { diff --git a/www/core/components/settings/lang/en.json b/www/core/components/settings/lang/en.json index 5a6eb31b34b..eba2a83b4dc 100644 --- a/www/core/components/settings/lang/en.json +++ b/www/core/components/settings/lang/en.json @@ -40,6 +40,7 @@ "navigatorlanguage": "Navigator language", "navigatoruseragent": "Navigator userAgent", "networkstatus": "Internet connection status", + "privacypolicy": "Privacy policy", "processorsettings": "Processor settings", "reportinbackground": "Report errors automatically", "settings": "Settings", diff --git a/www/core/components/settings/templates/about.html b/www/core/components/settings/templates/about.html index d788eddea8b..fca46dec26d 100644 --- a/www/core/components/settings/templates/about.html +++ b/www/core/components/settings/templates/about.html @@ -11,6 +11,12 @@

{{appname}} {{versionname}}

Apache 2.0

http://www.apache.org/licenses/LICENSE-2.0

+
  • +

    {{ 'mm.settings.privacypolicy' | translate }}

    +
  • +
  • +

    {{ privacyPolicy }}

    +
  • {{ 'mm.settings.deviceinfo' | translate }}

  • @@ -24,7 +30,7 @@

    Apache 2.0

  • {{ 'mm.settings.filesystemroot' | translate}}

    - {{ filesystemroot }} +

    {{ filesystemroot }}

    {{ filesystemroot }}