Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions upgrade.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ===

Expand Down
3 changes: 2 additions & 1 deletion www/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@
"customurlscheme": "moodlemobile",
"siteurl": "",
"skipssoconfirmation": "false",
"forcedefaultlanguage": "false"
"forcedefaultlanguage": "false",
"privacypolicy": "https://moodle.org/mod/page/view.php?id=8148"
}
1 change: 1 addition & 0 deletions www/core/components/settings/controllers/about.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions www/core/components/settings/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 7 additions & 1 deletion www/core/components/settings/templates/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ <h2>{{appname}} {{versionname}}</h2>
<h2>Apache 2.0</h2>
<p><a href="http://www.apache.org/licenses/LICENSE-2.0" mm-link auto-login="no">http://www.apache.org/licenses/LICENSE-2.0</a></p>
</li>
<li class="item item-divider" ng-if="privacyPolicy">
<p>{{ 'mm.settings.privacypolicy' | translate }}</p>
</li>
<li class="item item-text-wrap" ng-if="privacyPolicy">
<p><a ng-href="{{ privacyPolicy }}" mm-link auto-login="no">{{ privacyPolicy }}</a></p>
</li>
<li class="item item-divider">
<p>{{ 'mm.settings.deviceinfo' | translate }}</p>
</li>
Expand All @@ -24,7 +30,7 @@ <h2>Apache 2.0</h2>
</li>
<li class="item item-text-wrap" ng-if="filesystemroot">
<p class="item-heading">{{ 'mm.settings.filesystemroot' | translate}}</p>
<a ng-if="fsclickable" ng-href="{{filesystemroot}}" mm-link auto-login="no">{{ filesystemroot }}</a>
<p><a ng-if="fsclickable" ng-href="{{filesystemroot}}" mm-link auto-login="no">{{ filesystemroot }}</a></p>
<p ng-if="!fsclickable">{{ filesystemroot }}</p>
</li>
<li class="item item-text-wrap" ng-if="navigator && navigator.userAgent">
Expand Down